Handle more negative cases

Author: rjeberhard

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

@@ -185,27 +185,29 @@ public Process exec(
   }
 
   static int parseExitCode(InputStream inputStream) {
-    int exitCode = 0;
     try {
       int available = inputStream.available();
-      if (available > 0) {
-        byte[] b = new byte[available];
-        inputStream.read(b);
-        String result = new String(b, "UTF-8");
-        int idx = result.lastIndexOf(':');
-        if (idx > 0) {
-          try {
-            exitCode = Integer.parseInt(result.substring(idx + 1).trim());
-          } catch (NumberFormatException nfe) {
-            log.error("Error parsing exit code from status channel response", nfe);
-          }
+
+      // Kubernetes returns no content when the exit code is 0
+      if (available == 0) return 0;
+
+      byte[] b = new byte[available];
+      inputStream.read(b);
+      String result = new String(b, "UTF-8");
+      int idx = result.lastIndexOf(':');
+      if (idx > 0) {
+        try {
+          return Integer.parseInt(result.substring(idx + 1).trim());
+        } catch (NumberFormatException nfe) {
+          log.error("Error parsing exit code from status channel response", nfe);
         }
       }
     } catch (IOException io) {
       log.error("Error parsing exit code from status channel response", io);
     }
 
-    return exitCode;
+    // Unable to parse the exit code from the content
+    return -1;
   }
 
   private static class ExecProcess extends Process {

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

@@ -1,5 +1,5 @@
 /*
-Copyright 2017 The Kubernetes Authors.
+Copyright 2017, 2018 The Kubernetes Authors.
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
@@ -51,7 +51,7 @@ public interface SocketListener {
     public void open(String protocol, WebSocket socket);
 
     /**
-     * Callled when a binary media type message is received
+     * Called when a binary media type message is received
      *
      * @param in The input stream containing the binary data
      */

util/src/test/java/io/kubernetes/client/ExecTest.java

@@ -25,6 +25,9 @@ public class ExecTest {
       "command terminated with non-zero exit code: Error executing in Docker Container: 1";
   private static final String OUTPUT_EXIT126 =
       "command terminated with non-zero exit code: Error executing in Docker Container: 126";
+  private static final String BAD_OUTPUT_INCOMPLETE_MSG1 =
+      "command terminated with non-zero exit code: Error ";
+  private static final String BAD_OUTPUT_INCOMPLETE_MSG2 = "command terminated with non-zero";
 
   @Test
   public void testExit0() {
@@ -48,4 +51,20 @@ public void testExit126() {
     int exitCode = Exec.parseExitCode(inputStream);
     assertEquals(126, exitCode);
   }
+
+  @Test
+  public void testIncompleteData1() {
+    InputStream inputStream =
+        new ByteArrayInputStream(BAD_OUTPUT_INCOMPLETE_MSG1.getBytes(StandardCharsets.UTF_8));
+    int exitCode = Exec.parseExitCode(inputStream);
+    assertEquals(-1, exitCode);
+  }
+
+  @Test
+  public void testIncompleteData2() {
+    InputStream inputStream =
+        new ByteArrayInputStream(BAD_OUTPUT_INCOMPLETE_MSG2.getBytes(StandardCharsets.UTF_8));
+    int exitCode = Exec.parseExitCode(inputStream);
+    assertEquals(-1, exitCode);
+  }
 }