Merge pull request #106 from brendandburns/close

Fix up some potential leaks, by calling close()

Author: mbohlool

examples/src/main/java/io/kubernetes/client/examples/AttachExample.java

@@ -42,7 +42,7 @@ public static void main(String[] args) throws IOException, ApiException, Interru
         Configuration.setDefaultApiClient(client);
 
         Attach attach = new Attach();
-        final Attach.AttachResult result = attach.attach("default", "nginx-2371676037-czqx3", true);
+        final Attach.AttachResult result = attach.attach("default", "nginx-4217019353-k5sn9", true);
 
         new Thread(new Runnable() {
             public void run() {
@@ -72,7 +72,7 @@ public void run() {
         }).start();
 
         Thread.sleep(10*1000);
-
+        result.close();
         System.exit(0);
     }
 }

examples/src/main/java/io/kubernetes/client/examples/ExecExample.java

@@ -44,7 +44,7 @@ public static void main(String[] args) throws IOException, ApiException, Interru
         Exec exec = new Exec();
         boolean tty = System.console() != null;
 //        final Process proc = exec.exec("default", "nginx-2371676037-czqx3", new String[] {"sh", "-c", "echo foo"}, true, tty);
-        final Process proc = exec.exec("default", "nginx-2371676037-czqx3", new String[] {"sh"}, true, tty);
+        final Process proc = exec.exec("default", "nginx-4217019353-k5sn9", new String[] {"sh"}, true, tty);
 
 
         new Thread(new Runnable() {
@@ -75,6 +75,8 @@ public void run() {
             ex.printStackTrace();
         }
 
+        proc.destroy();
+
         System.exit(0);
     }
 }

util/src/main/java/io/kubernetes/client/Attach.java

@@ -145,7 +145,7 @@ public AttachResult attach(String namespace, String name, String container, bool
      * AttachResult contains the result of an Attach call, it includes streams for stdout
      * stderr and stdin. 
      */
-    public static class AttachResult {        
+    public static class AttachResult implements java.io.Closeable {        
         private WebSocketStreamHandler handler;
 
 
@@ -164,5 +164,9 @@ public InputStream getStandardOutputStream() throws IOException {
         public InputStream getErrorStream() throws IOException {
             return handler.getInputStream(2);
         }
+
+        public void close() {
+            handler.close();
+        }
     }
 }

util/src/main/java/io/kubernetes/client/ProtoClient.java

@@ -167,6 +167,8 @@ public <T extends Message> ObjectOrStatus<T> request(T.Builder builder, String p
         }
         Response resp = apiClient.getHttpClient().newCall(request).execute();
         Unknown u = parse(resp.body().byteStream());
+        resp.body().close();
+
         if (u.getTypeMeta().getApiVersion().equals("v1") &&
             u.getTypeMeta().getKind().equals("Status")) {
             Status status = Status.newBuilder().mergeFrom(u.getRaw()).build();

util/src/main/java/io/kubernetes/client/util/WebSocketStreamHandler.java

@@ -36,7 +36,7 @@
  * WebSocketStreamHandler understands the Kubernetes streaming protocol and separates
  * a single WebSockets stream into a number of different streams using that protocol.
  */
-public class WebSocketStreamHandler implements WebSockets.SocketListener {
+public class WebSocketStreamHandler implements WebSockets.SocketListener, Closeable {
     Map<Integer, PipedOutputStream> output;
     Map<Integer, PipedInputStream> input;
     WebSocket socket;
@@ -95,14 +95,6 @@ public void close() {
                 ex.printStackTrace();
             }
         }
-        /*
-        try {
-            socket.close(1000, "User closed connection");
-        } catch (IOException ex) {
-            // TODO use a logger here
-            ex.printStackTrace();
-        }
-        */
     }
 
     /**