You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/05/10 09:24:29 UTC
[tomcat] 01/03: Revert 6232d82 prior to implementing an alternative
fix
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6a0ad7d15662346f907432831721e3e3b2282096
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri May 10 10:15:07 2019 +0100
Revert 6232d82 prior to implementing an alternative fix
---
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 2db837a..213b884 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -752,7 +752,6 @@ class Http2UpgradeHandler extends AbstractStream implements InternalHttpUpgradeH
// this thread until after this thread enters wait()
int allocation = 0;
synchronized (stream) {
- long writeTimeout = protocol.getWriteTimeout();
do {
synchronized (this) {
if (!stream.canWrite()) {
@@ -805,17 +804,16 @@ class Http2UpgradeHandler extends AbstractStream implements InternalHttpUpgradeH
// Connection level window is empty. Although this
// request is for a stream, use the connection
// timeout
+ long writeTimeout = protocol.getWriteTimeout();
if (writeTimeout < 0) {
stream.wait();
} else {
- long t1 = System.currentTimeMillis();
stream.wait(writeTimeout);
- writeTimeout -= (System.currentTimeMillis() + 1 - t1);
// Has this stream been granted an allocation
// Note: If the stream in not in this Map then the
// requested write has been fully allocated
int[] value = backLogStreams.get(stream);
- if (writeTimeout <= 0 && value != null && value[1] == 0) {
+ if (value != null && value[1] == 0) {
if (log.isDebugEnabled()) {
log.debug(sm.getString("upgradeHandler.noAllocation",
connectionId));
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org