# HG changeset patch
# User prappo
# Date 1521038543 0
# Node ID 88c1f551d45ef5773dd2e51b9561d9472bfe009a
# Parent  9027d1747dd0da638a5742d3404edfa00e282d56
http-client-branch: (WebSocket) logging typos and leftovers

diff -r 9027d1747dd0 -r 88c1f551d45e src/java.net.http/share/classes/jdk/internal/net/http/websocket/TransportImpl.java
--- a/src/java.net.http/share/classes/jdk/internal/net/http/websocket/TransportImpl.java	Wed Mar 14 14:32:07 2018 +0000
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/TransportImpl.java	Wed Mar 14 14:42:23 2018 +0000
@@ -103,9 +103,9 @@
     }
 
     private boolean write() throws IOException {
-        debug.log(Level.DEBUG, "writing to the channel%n");
+        debug.log(Level.DEBUG, "writing to the channel");
         long count = channel.write(dstArray, 0, dstArray.length);
-        debug.log(Level.DEBUG, "%s bytes written%n", count);
+        debug.log(Level.DEBUG, "%s bytes written", count);
         for (ByteBuffer b : dstArray) {
             if (b.hasRemaining()) {
                 return false;
@@ -122,7 +122,7 @@
         long id = 0;
         if (debug.isLoggable(Level.DEBUG)) {
             id = counter.incrementAndGet();
-            debug.log(Level.DEBUG, "enter send text %s message.length()=%s last=%s%n",
+            debug.log(Level.DEBUG, "enter send text %s message.length()=%s last=%s",
                               id, message.length(), isLast);
         }
         // TODO (optimization?):
@@ -141,7 +141,7 @@
         } catch (IOException e) {
             f.completeExceptionally(e);
         }
-        debug.log(Level.DEBUG, "exit send text %s returned %s%n", id, f);
+        debug.log(Level.DEBUG, "exit send text %s returned %s", id, f);
         return f;
     }
 
@@ -153,7 +153,7 @@
         long id = 0;
         if (debug.isLoggable(Level.DEBUG)) {
             id = counter.incrementAndGet();
-            debug.log(Level.DEBUG, "enter send binary %s message.remaining()=%s last=%s%n",
+            debug.log(Level.DEBUG, "enter send binary %s message.remaining()=%s last=%s",
                               id, message.remaining(), isLast);
         }
         MinimalFuture<T> f = new MinimalFuture<>();
@@ -163,7 +163,7 @@
         } catch (IOException e) {
             f.completeExceptionally(e);
         }
-        debug.log(Level.DEBUG, "exit send binary %s returned %s%n", id, f);
+        debug.log(Level.DEBUG, "exit send binary %s returned %s", id, f);
         return f;
     }
 
@@ -174,7 +174,7 @@
         long id = 0;
         if (debug.isLoggable(Level.DEBUG)) {
             id = counter.incrementAndGet();
-            debug.log(Level.DEBUG, "enter send ping %s message.remaining()=%s%n",
+            debug.log(Level.DEBUG, "enter send ping %s message.remaining()=%s",
                               id, message.remaining());
         }
         MinimalFuture<T> f = new MinimalFuture<>();
@@ -184,7 +184,7 @@
         } catch (IOException e) {
             f.completeExceptionally(e);
         }
-        debug.log(Level.DEBUG, "exit send ping %s returned %s%n", id, f);
+        debug.log(Level.DEBUG, "exit send ping %s returned %s", id, f);
         return f;
     }
 
@@ -195,7 +195,7 @@
         long id = 0;
         if (debug.isLoggable(Level.DEBUG)) {
             id = counter.incrementAndGet();
-            debug.log(Level.DEBUG, "enter send pong %s message.remaining()=%s%n",
+            debug.log(Level.DEBUG, "enter send pong %s message.remaining()=%s",
                               id, message.remaining());
         }
         MinimalFuture<T> f = new MinimalFuture<>();
@@ -205,7 +205,7 @@
         } catch (IOException e) {
             f.completeExceptionally(e);
         }
-        debug.log(Level.DEBUG, "exit send pong %s returned %s%n", id, f);
+        debug.log(Level.DEBUG, "exit send pong %s returned %s", id, f);
         return f;
     }
 
@@ -216,7 +216,7 @@
         long id = 0;
         if (debug.isLoggable(Level.DEBUG)) {
             id = counter.incrementAndGet();
-            debug.log(Level.DEBUG, "enter send pong %s supplier=%s%n",
+            debug.log(Level.DEBUG, "enter send pong %s supplier=%s",
                       id, message);
         }
         MinimalFuture<T> f = new MinimalFuture<>();
@@ -226,7 +226,7 @@
         } catch (IOException e) {
             f.completeExceptionally(e);
         }
-        debug.log(Level.DEBUG, "exit send pong %s returned %s%n", id, f);
+        debug.log(Level.DEBUG, "exit send pong %s returned %s", id, f);
         return f;
     }
 
@@ -514,7 +514,7 @@
                         removeAndComplete(null);
                     }
                 } catch (Throwable t) {
-                    debug.log(Level.DEBUG, "send task exception %s", (Object)t);
+                    debug.log(Level.DEBUG, "send task exception %s", (Object) t);
                     // buffer cleanup: if there is an exception, the buffer
                     // should appear empty for the next write as there is
                     // nothing to write
@@ -565,7 +565,7 @@
         @SuppressWarnings("unchecked")
         private void removeAndComplete(Throwable error) {
             debug.log(Level.DEBUG, "removeAndComplete error=%s",
-                    (Object)error);
+                    (Object) error);
             queue.remove();
             if (error != null) {
                 try {
diff -r 9027d1747dd0 -r 88c1f551d45e src/java.net.http/share/classes/jdk/internal/net/http/websocket/WebSocketImpl.java
--- a/src/java.net.http/share/classes/jdk/internal/net/http/websocket/WebSocketImpl.java	Wed Mar 14 14:32:07 2018 +0000
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/WebSocketImpl.java	Wed Mar 14 14:42:23 2018 +0000
@@ -365,7 +365,7 @@
 
     @Override
     public void abort() {
-        debug.log(Level.DEBUG, "abort ");
+        debug.log(Level.DEBUG, "abort");
         inputClosed = true;
         outputClosed = true;
         receiveScheduler.stop();