Merge pull request kubernetes-client#700 from brendandburns/close

k8s-ci-robot · web-flow · commit 44ee6ad0f6ba · 2019-09-19T20:48:59.000-07:00
Improve close behavior some.
diff --git a/util/src/main/java/io/kubernetes/client/Copy.java b/util/src/main/java/io/kubernetes/client/Copy.java
@@ -115,8 +115,8 @@ public void copyDirectoryFromPod(
             container,
             false,
             false);
-    InputStream is = new Base64InputStream(new BufferedInputStream(proc.getInputStream()));
-    try (ArchiveInputStream archive = new TarArchiveInputStream(is)) {
+    try (InputStream is = new Base64InputStream(new BufferedInputStream(proc.getInputStream()));
+        ArchiveInputStream archive = new TarArchiveInputStream(is)) {
       // TODO Use new GzipCompressorInputStream(is))) here {
       for (ArchiveEntry entry = archive.getNextEntry();
           entry != null;
@@ -136,7 +136,6 @@ public void copyDirectoryFromPod(
             throw new IOException("create directory failed: " + parent);
           }
           try (OutputStream fs = new FileOutputStream(f)) {
-            System.out.println("Writing: " + f.getCanonicalPath());
             ByteStreams.copy(archive, fs);
             fs.flush();
           }
@@ -156,10 +155,10 @@ public void copyDirectoryFromPod(
   public static void copyFileFromPod(String namespace, String pod, String srcPath, Path dest)
       throws ApiException, IOException {
     Copy c = new Copy();
-    InputStream is = c.copyFileFromPod(namespace, pod, null, srcPath);
-    FileOutputStream os = new FileOutputStream(dest.toFile());
-    ByteStreams.copy(is, os);
-    os.flush();
-    os.close();
+    try (InputStream is = c.copyFileFromPod(namespace, pod, null, srcPath);
+        FileOutputStream os = new FileOutputStream(dest.toFile())) {
+      ByteStreams.copy(is, os);
+      os.flush();
+    }
   }
 }
diff --git a/util/src/main/java/io/kubernetes/client/Exec.java b/util/src/main/java/io/kubernetes/client/Exec.java
@@ -275,6 +275,7 @@ protected void handleMessage(int stream, InputStream inStream) throws IOExceptio
                     ExecProcess.this.notifyAll();
                   }
                 }
+                inStream.close();
               } else super.handleMessage(stream, inStream);
             }
 
diff --git a/util/src/main/java/io/kubernetes/client/util/Watch.java b/util/src/main/java/io/kubernetes/client/util/Watch.java
@@ -21,6 +21,7 @@
 import io.kubernetes.client.ApiException;
 import io.kubernetes.client.JSON;
 import io.kubernetes.client.models.V1Status;
+import java.io.Closeable;
 import java.io.IOException;
 import java.io.StringReader;
 import java.lang.reflect.Type;
@@ -34,7 +35,7 @@
  * example CoreV1Api.listNamespace has watch parameter, so you can create a call using
  * CoreV1Api.listNamespaceCall and set watch to True and watch the changes to namespaces.
  */
-public class Watch<T> implements Watchable<T> {
+public class Watch<T> implements Watchable<T>, Closeable {
 
   private static final Logger log = LoggerFactory.getLogger(Watch.class);
 
@@ -94,7 +95,7 @@ public static <T> Watch<T> createWatch(ApiClient client, Call call, Type watchTy
         String respBody = null;
         try (ResponseBody body = response.body()) {
           if (body != null) {
-            respBody = response.body().string();
+            respBody = body.string();
           }
         } catch (IOException e) {
           throw new ApiException(
diff --git a/util/src/main/java/io/kubernetes/client/util/WebSocketStreamHandler.java b/util/src/main/java/io/kubernetes/client/util/WebSocketStreamHandler.java
@@ -85,8 +85,12 @@ public void textMessage(Reader in) {
   }
 
   protected void handleMessage(int stream, InputStream inStream) throws IOException {
-    OutputStream out = getSocketInputOutputStream(stream);
-    ByteStreams.copy(inStream, out);
+    try {
+      OutputStream out = getSocketInputOutputStream(stream);
+      ByteStreams.copy(inStream, out);
+    } finally {
+      inStream.close();
+    }
   }
 
   @Override
diff --git a/util/src/main/java/io/kubernetes/client/util/WebSockets.java b/util/src/main/java/io/kubernetes/client/util/WebSockets.java
@@ -136,12 +136,15 @@ public void onOpen(final WebSocket webSocket, Response response) {
 
     @Override
     public void onMessage(ResponseBody body) throws IOException {
-      if (body.contentType() == TEXT) {
-        listener.textMessage(body.charStream());
-      } else if (body.contentType() == BINARY) {
-        listener.bytesMessage(body.byteStream());
+      try {
+        if (body.contentType() == TEXT) {
+          listener.textMessage(body.charStream());
+        } else if (body.contentType() == BINARY) {
+          listener.bytesMessage(body.byteStream());
+        }
+      } finally {
+        body.close();
       }
-      body.close();
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -275,6 +275,7 @@ protected void handleMessage(int stream, InputStream inStream) throws IOExceptio`
`275`	`275`	`ExecProcess.this.notifyAll();`
`276`	`276`	`}`
`277`	`277`	`}`
	`278`	`+ inStream.close();`
`278`	`279`	`} else super.handleMessage(stream, inStream);`
`279`	`280`	`}`
`280`	`281`
Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,12 @@ public void textMessage(Reader in) {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`protected void handleMessage(int stream, InputStream inStream) throws IOException {`
`88`		`- OutputStream out = getSocketInputOutputStream(stream);`
`89`		`- ByteStreams.copy(inStream, out);`
	`88`	`+ try {`
	`89`	`+ OutputStream out = getSocketInputOutputStream(stream);`
	`90`	`+ ByteStreams.copy(inStream, out);`
	`91`	`+ } finally {`
	`92`	`+ inStream.close();`
	`93`	`+ }`
`90`	`94`	`}`
`91`	`95`
`92`	`96`	`@Override`