Author: markt
Date: Wed Aug 19 11:25:13 2015
New Revision: 1696561
URL: http://svn.apache.org/r1696561
Log:
Improve debug information while working on a (not yet committed) new test case
for section 6.9
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
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=1696561&r1=1696560&r2=1696561&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Wed Aug
19 11:25:13 2015
@@ -592,7 +592,9 @@ public class Http2UpgradeHandler extends
try {
stream.wait();
} catch (InterruptedException e) {
- throw new IOException(e);
+ throw new IOException(sm.getString(
+
"upgradeHandler.windowSizeReservationInterrupted", connectionId,
+ stream.getIdentifier(),
Integer.toString(reservation)), e);
}
}
} while (allocation == 0);
Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1696561&r1=1696560&r2=1696561&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Wed Aug
19 11:25:13 2015
@@ -69,6 +69,8 @@ stream.reprioritisation.debug=Connection
stream.reset.debug=Connection [{0}], Stream [{1}], Reset due to [{2}]
stream.write=Connection [{0}], Stream [{1}]
+stream.outputBuffer.flush.debug=Connection [{0}], Stream [{1}], flushing
output with buffer at position [{2}], writeInProgress [{3}] and closed [{4}]
+
streamProcessor.httpupgrade.notsupported=HTTP upgrade is not supported within
HTTP/2 streams
streamStateMachine.debug.change=Connection [{0}], Stream [{1}], State changed
from [{2}] to [{3}]
@@ -99,6 +101,7 @@ upgradeHandler.upgrade=Connection [{0}],
upgradeHandler.upgrade.fail=Connection [{0}], HTTP/1.1 upgrade failed
upgradeHandler.upgradeDispatch.entry=Entry, Connection [{0}], SocketStatus
[{1}]
upgradeHandler.upgradeDispatch.exit=Exit, Connection [{0}], SocketState [{1}]
+upgradeHandler.windowSizeReservationInterrupted=Connection [{0}], Stream
[{1}], reservation for [{2}] bytes
upgradeHandler.writeBody=Connection [{0}], Stream [{1}], Data length [{2}]
upgradeHandler.writeHeaders=Connection [{0}], Stream [{1}]
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=1696561&r1=1696560&r2=1696561&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Wed Aug 19 11:25:13
2015
@@ -322,6 +322,11 @@ public class Stream extends AbstractStre
}
private synchronized void flush(boolean writeInProgress) throws
IOException {
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("stream.outputBuffer.flush.debug",
getConnectionId(), getIdentifier(),
+ Integer.toString(buffer.position()),
Boolean.toString(writeInProgress),
+ Boolean.toString(closed)));
+ }
if (!coyoteResponse.isCommitted()) {
coyoteResponse.sendHeaders();
}
@@ -342,7 +347,6 @@ public class Stream extends AbstractStre
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
