fix(okhttp): cannot call close if body is null

close: #7087

Signed-off-by: Steve Hawkins <[email protected]>

Author: shawkins

CHANGELOG.md

@@ -4,6 +4,7 @@
 * Fix #7116: (java-generator) Use timezone format compatible with Kubernetes
 
 #### Bugs
+* Fix #7087: Avoid possible NPE in OkHttp websocket handlinger
 * Fix #7080: Avoid NPE in CRDGenerator if post-processor is set to null
 
 #### Improvements

httpclient-okhttp/src/main/java/io/fabric8/kubernetes/client/okhttp/OkHttpWebSocketImpl.java

@@ -75,13 +75,10 @@ public static CompletableFuture<WebSocketResponse> buildAsync(OkHttpClient httpC
 
       @Override
       public void onFailure(okhttp3.WebSocket webSocket, Throwable t, Response response) {
-        if (response != null) {
-          response.close();
-        }
+        // Ensure response body is always closed (leak)
+        Optional.ofNullable(response).map(Response::body).ifPresent(ResponseBody::close);
         if (!opened) {
           if (response != null) {
-            // Ensure response body is always closed (leak)
-            Optional.ofNullable(response.body()).ifPresent(ResponseBody::close);
             final WebSocketUpgradeResponse upgradeResponse = new WebSocketUpgradeResponse(
                 fabric8Request, response.code(), response.headers().toMultimap());
             future.complete(new WebSocketResponse(upgradeResponse, t));