Author: violetagg
Date: Fri Sep 23 11:06:12 2016
New Revision: 1762051
URL: http://svn.apache.org/viewvc?rev=1762051&view=rev
Log:
When there is ByteBuffer use the new method SocketWrapperBase.write(boolean,
ByteBuffer)
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1762051&r1=1762050&r2=1762051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Fri Sep
23 11:06:12 2016
@@ -537,7 +537,7 @@ public class Http2UpgradeHandler extends
ByteUtil.set31Bits(header, 5,
stream.getIdentifier().intValue());
try {
socketWrapper.write(true, header, 0, header.length);
- socketWrapper.write(true, target.array(),
target.arrayOffset(), target.limit());
+ socketWrapper.write(true, target);
socketWrapper.flush(true);
} catch (IOException ioe) {
handleAppInitiatedIOException(ioe);
@@ -606,7 +606,7 @@ public class Http2UpgradeHandler extends
}
ByteUtil.set31Bits(header, 5,
stream.getIdentifier().intValue());
socketWrapper.write(true, header, 0, header.length);
- socketWrapper.write(true, target.array(),
target.arrayOffset(), target.limit());
+ socketWrapper.write(true, target);
socketWrapper.flush(true);
}
}
@@ -640,8 +640,10 @@ public class Http2UpgradeHandler extends
synchronized (socketWrapper) {
try {
socketWrapper.write(true, header, 0, header.length);
- socketWrapper.write(true, data.array(), data.arrayOffset() +
data.position(),
- len);
+ int orgLimit = data.limit();
+ data.limit(len);
+ socketWrapper.write(true, data);
+ data.limit(orgLimit);
socketWrapper.flush(true);
} catch (IOException ioe) {
handleAppInitiatedIOException(ioe);
Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1762051&r1=1762050&r2=1762051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Fri Sep 23 11:06:12
2016
@@ -555,7 +555,6 @@ public class Stream extends AbstractStre
!writeInProgress && closed && left ==
connectionReservation);
streamReservation -= connectionReservation;
left -= connectionReservation;
- buffer.position(buffer.position() + connectionReservation);
}
}
buffer.clear();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
