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 2012/03/15 11:44:37 UTC
svn commit: r1300898 -
/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
Author: markt
Date: Thu Mar 15 10:44:37 2012
New Revision: 1300898
URL: http://svn.apache.org/viewvc?rev=1300898&view=rev
Log:
Remove an accidental commit
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1300898&r1=1300897&r2=1300898&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Mar 15 10:44:37 2012
@@ -533,12 +533,6 @@ public abstract class AbstractProtocol i
SocketStatus status) {
P processor = connections.remove(socket.getSocket());
- if (getLog().isDebugEnabled()) {
- getLog().debug("process() entry " +
- "Socket: [" + logHashcode(socket.getSocket()) + "], " +
- "Processor [" + logHashcode(processor) + "]");
- }
-
socket.setAsync(false);
try {
@@ -549,51 +543,20 @@ public abstract class AbstractProtocol i
processor = createProcessor();
}
- if (getLog().isDebugEnabled()) {
- getLog().debug("process() gotProcessor " +
- "Socket: [" + logHashcode(socket.getSocket()) + "], " +
- "Processor [" + logHashcode(processor) + "]");
- }
-
initSsl(socket, processor);
SocketState state = SocketState.CLOSED;
do {
if (processor.isAsync() || state == SocketState.ASYNC_END) {
state = processor.asyncDispatch(status);
- if (getLog().isDebugEnabled()) {
- getLog().debug("process() asyncDispatch " +
- "Socket: [" + logHashcode(socket.getSocket()) + "], " +
- "Processor: [" + logHashcode(processor) + "], " +
- "State: [" + state.toString() + "]");
- }
} else if (processor.isComet()) {
state = processor.event(status);
- if (getLog().isDebugEnabled()) {
- getLog().debug("process() event " +
- "Socket: [" + logHashcode(socket.getSocket()) + "], " +
- "Processor: [" + logHashcode(processor) + "], " +
- "State: [" + state.toString() + "]");
- }
} else {
state = processor.process(socket);
- if (getLog().isDebugEnabled()) {
- getLog().debug("process() process " +
- "Socket: [" + logHashcode(socket.getSocket()) + "], " +
- "Processor: [" + logHashcode(processor) + "], " +
- "State: [" + state.toString() + "]");
- }
}
if (state != SocketState.CLOSED && processor.isAsync()) {
state = processor.asyncPostProcess();
- if (getLog().isDebugEnabled()) {
- getLog().debug("process() asyncPostProcess " +
- "Socket: [" + logHashcode(socket.getSocket()) + "], " +
- "Processor: [" + logHashcode(processor) + "], " +
- "State: [" + state.toString() + "]");
- }
-
}
} while (state == SocketState.ASYNC_END);
@@ -639,14 +602,6 @@ public abstract class AbstractProtocol i
return SocketState.CLOSED;
}
- private String logHashcode (Object o) {
- if (o == null) {
- return "null";
- } else {
- return Integer.toString(o.hashCode());
- }
- }
-
protected abstract P createProcessor();
protected abstract void initSsl(SocketWrapper<S> socket, P processor);
protected abstract void longPoll(SocketWrapper<S> socket, P processor);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org