[jbossweb-commits] JBossWeb SVN: r1762 - in trunk/java/org/apache: catalina/core and 1 other directories.
Author: remy.maucherat(a)jboss.com
Date: 2011-07-04 06:53:24 -0400 (Mon, 04 Jul 2011)
New Revision: 1762
Modified:
trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
trunk/java/org/apache/catalina/core/StandardWrapperValve.java
trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
Log:
Some cleanups related to JBWEB-205.
Modified: trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
===================================================================
--- trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2011-07-04 09:42:01 UTC
(rev 1761)
+++ trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2011-07-04 10:53:24 UTC
(rev 1762)
@@ -523,7 +523,6 @@
}
connector.getService().getMapper().map(serverName, decodedURI,
request.getMappingData());
- log.error("Merde: " + request.getMappingData().context + " :
" + request.getMappingData().host + " : " + request.getMappingData());
request.setContext((Context) request.getMappingData().context);
request.setWrapper((Wrapper) request.getMappingData().wrapper);
Modified: trunk/java/org/apache/catalina/core/StandardWrapperValve.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardWrapperValve.java 2011-07-04 09:42:01 UTC
(rev 1761)
+++ trunk/java/org/apache/catalina/core/StandardWrapperValve.java 2011-07-04 10:53:24 UTC
(rev 1762)
@@ -640,7 +640,7 @@
asyncContext.complete();
}
} else {
- throw new
IllegalStateException(sm.getString("standardWrapper.async.invalidContext",
+
container.getLogger().warn(sm.getString("standardWrapper.async.invalidContext",
getContainer().getName()));
}
}
Modified: trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
===================================================================
--- trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java 2011-07-04 09:42:01 UTC (rev
1761)
+++ trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java 2011-07-04 10:53:24 UTC (rev
1762)
@@ -794,6 +794,7 @@
}
} else {
if (info.resume()) {
+ timeouts.remove(info.socket);
if (!processSocket(info.socket,
SocketStatus.OPEN_CALLBACK)) {
try { info.socket.close(); } catch (IOException
e) { }
}