Author: markt
Date: Fri Oct 28 08:01:05 2011
New Revision: 1190192
URL: http://svn.apache.org/viewvc?rev=1190192&view=rev
Log:
Revert accidental commit
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1190192&r1=1190191&r2=1190192&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Fri Oct 28
08:01:05 2011
@@ -493,12 +493,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 {
@@ -509,51 +503,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);
@@ -599,14 +562,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: [email protected]
For additional commands, e-mail: [email protected]
