Merge pull request #2387 from dani8art/output-stream-flush-order

fix: WebSocketStreamHandler flush first and then close WebSocket

Author: k8s-ci-robot

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

@@ -111,12 +111,6 @@ public Throwable getError() {
   @Override
   public synchronized void close() {
     if (state != State.CLOSED) {
-      state = State.CLOSED;
-      if (null != socket) {
-        // code 1000 means "Normal Closure"
-        socket.close(1000, "Triggered client-side terminate");
-        log.debug("Successfully closed socket.");
-      }
       // Close all output streams.  Caller of getInputStream(int) is responsible
       // for closing returned input streams
       for (PipedOutputStream out : pipedOutput.values()) {
@@ -143,6 +137,13 @@ public synchronized void close() {
           log.error("Error on close", ex);
         }
       }
+
+      state = State.CLOSED;
+      if (null != socket) {
+        // code 1000 means "Normal Closure"
+        socket.close(1000, "Triggered client-side terminate");
+        log.debug("Successfully closed socket.");
+      }
     }
     notifyAll();
   }