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
The following commit(s) were added to refs/heads/master by this push:
new 3aa05ba Revert debugging changes for testing BZ 63682
3aa05ba is described below
commit 3aa05baa6b9cd3c907ecd55e1ebb340d8c9689ab
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Sep 13 16:48:04 2019 +0100
Revert debugging changes for testing BZ 63682
---
.../coyote/http2/WindowAllocationManager.java | 42 +++++++++++-----------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/java/org/apache/coyote/http2/WindowAllocationManager.java
b/java/org/apache/coyote/http2/WindowAllocationManager.java
index ee865b0..f286430 100644
--- a/java/org/apache/coyote/http2/WindowAllocationManager.java
+++ b/java/org/apache/coyote/http2/WindowAllocationManager.java
@@ -65,40 +65,40 @@ class WindowAllocationManager {
}
void waitForStream(long timeout) throws InterruptedException {
- //if (log.isDebugEnabled()) {
- log.info(sm.getString("windowAllocationManager.waitFor.stream",
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("windowAllocationManager.waitFor.stream",
stream.getConnectionId(), stream.getIdentifier(),
Long.toString(timeout)));
- //}
+ }
waitFor(STREAM, timeout);
}
void waitForConnection(long timeout) throws InterruptedException {
- //if (log.isDebugEnabled()) {
- log.info(sm.getString("windowAllocationManager.waitFor.connection",
+ if (log.isDebugEnabled()) {
+
log.debug(sm.getString("windowAllocationManager.waitFor.connection",
stream.getConnectionId(), stream.getIdentifier(),
Long.toString(timeout)));
- //}
+ }
waitFor(CONNECTION, timeout);
}
void waitForStreamNonBlocking() {
- //if (log.isDebugEnabled()) {
-
log.info(sm.getString("windowAllocationManager.waitForNonBlocking.stream",
+ if (log.isDebugEnabled()) {
+
log.debug(sm.getString("windowAllocationManager.waitForNonBlocking.stream",
stream.getConnectionId(), stream.getIdentifier()));
- //}
+ }
waitForNonBlocking(STREAM);
}
void waitForConnectionNonBlocking() {
- //if (log.isDebugEnabled()) {
-
log.info(sm.getString("windowAllocationManager.waitForNonBlocking.connection",
+ if (log.isDebugEnabled()) {
+
log.debug(sm.getString("windowAllocationManager.waitForNonBlocking.connection",
stream.getConnectionId(), stream.getIdentifier()));
- //}
+ }
waitForNonBlocking(CONNECTION);
}
@@ -171,10 +171,10 @@ class WindowAllocationManager {
private void notify(int notifyTarget) {
- //if (log.isDebugEnabled()) {
- log.info(sm.getString("windowAllocationManager.notify",
stream.getConnectionId(),
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("windowAllocationManager.notify",
stream.getConnectionId(),
stream.getIdentifier(), Integer.toString(waitingFor),
Integer.toString(notifyTarget)));
- //}
+ }
synchronized (stream) {
if ((notifyTarget & waitingFor) > NONE) {
@@ -186,17 +186,17 @@ class WindowAllocationManager {
waitingFor = NONE;
if (stream.getCoyoteResponse().getWriteListener() == null) {
// Blocking, so use notify to release StreamOutputBuffer
- //if (log.isDebugEnabled()) {
-
log.info(sm.getString("windowAllocationManager.notified",
+ if (log.isDebugEnabled()) {
+
log.debug(sm.getString("windowAllocationManager.notified",
stream.getConnectionId(),
stream.getIdentifier()));
- //}
+ }
stream.notify();
} else {
// Non-blocking so dispatch
- //if (log.isDebugEnabled()) {
-
log.info(sm.getString("windowAllocationManager.dispatched",
+ if (log.isDebugEnabled()) {
+
log.debug(sm.getString("windowAllocationManager.dispatched",
stream.getConnectionId(),
stream.getIdentifier()));
- //}
+ }
stream.getCoyoteResponse().action(ActionCode.DISPATCH_WRITE, null);
// Need to explicitly execute dispatches on the
StreamProcessor
// as this thread is being processed by an UpgradeProcessor
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
