Fixes #4971 - Simplify Connection.upgradeFrom()/upgradeTo().

Flip those buffers! Signed-off-by: Simone Bordet <[email protected]>
jetty · Jun 30, 2020 · fc10eb2 · fc10eb2
1 parent cef86c9
commit fc10eb2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/DetectorConnectionFactory.java b/jetty-server/src/main/java/org/eclipse/jetty/server/DetectorConnectionFactory.java
@@ -167,6 +167,7 @@ public ByteBuffer onUpgradeFrom()
             {
                 ByteBuffer unconsumed = ByteBuffer.allocateDirect(_buffer.remaining());
                 unconsumed.put(_buffer);
+                unconsumed.flip();
                 _connector.getByteBufferPool().release(_buffer);
                 return unconsumed;
             }

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
@@ -194,6 +194,7 @@ public ByteBuffer onUpgradeFrom()
         {
             ByteBuffer unconsumed = ByteBuffer.allocateDirect(_requestBuffer.remaining());
             unconsumed.put(_requestBuffer);
+            unconsumed.flip();
             releaseRequestBuffer();
             return unconsumed;
         }

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ProxyConnectionFactory.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ProxyConnectionFactory.java
@@ -238,6 +238,7 @@ public ByteBuffer onUpgradeFrom()
                 {
                     ByteBuffer unconsumed = ByteBuffer.allocateDirect(_buffer.remaining());
                     unconsumed.put(_buffer);
+                    unconsumed.flip();
                     _connector.getByteBufferPool().release(_buffer);
                     return unconsumed;
                 }
@@ -549,6 +550,7 @@ public ByteBuffer onUpgradeFrom()
                 {
                     ByteBuffer unconsumed = ByteBuffer.allocateDirect(_buffer.remaining());
                     unconsumed.put(_buffer);
+                    unconsumed.flip();
                     _connector.getByteBufferPool().release(_buffer);
                     return unconsumed;
                 }