[jbossweb-commits] JBossWeb SVN: r2128 - in branches/7.2.x/src/main/java/org: apache/tomcat/util/net and 1 other directories.
Author: remy.maucherat(a)jboss.com
Date: 2012-11-19 13:28:07 -0500 (Mon, 19 Nov 2012)
New Revision: 2128
Modified:
branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java
branches/7.2.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java
branches/7.2.x/src/main/java/org/jboss/web/CoyoteLogger.java
Log:
- Fix the new flag (oops).
- Allow adding with no events (only timeout and wait for wakeup, basically) so that real
Servlet 3 async actually works.
Modified: branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java
===================================================================
---
branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java 2012-11-19
15:40:31 UTC (rev 2127)
+++
branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java 2012-11-19
18:28:07 UTC (rev 2128)
@@ -917,6 +917,7 @@
} else {
recycledProcessors.offer(processor);
}
+ processor.endProcessing();
return state;
} catch (IOException e) {
Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java
===================================================================
--- branches/7.2.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java 2012-11-19
15:40:31 UTC (rev 2127)
+++ branches/7.2.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java 2012-11-19
18:28:07 UTC (rev 2128)
@@ -1335,12 +1335,6 @@
} else if (info.wakeup()) {
remove(info);
// TODO
- } else {
- CoyoteLogger.UTIL_LOGGER.unknownEvent();
- remove(info);
- if (!processChannel(ch, SocketStatus.ERROR)) {
- closeChannel(ch);
- }
}
// Wake up all waiting threads
Modified: branches/7.2.x/src/main/java/org/jboss/web/CoyoteLogger.java
===================================================================
--- branches/7.2.x/src/main/java/org/jboss/web/CoyoteLogger.java 2012-11-19 15:40:31 UTC
(rev 2127)
+++ branches/7.2.x/src/main/java/org/jboss/web/CoyoteLogger.java 2012-11-19 18:28:07 UTC
(rev 2128)
@@ -179,9 +179,9 @@
@Message(id = 3025, value = "Error awaiting read")
void errorAwaitingRead(@Cause Throwable exception);
- @LogMessage(level = DEBUG)
- @Message(id = 3026, value = "Unknown event")
- void unknownEvent();
+ @LogMessage(level = ERROR)
+ @Message(id = 3026, value = "Error loading %s")
+ void errorLoading(Object source);
@LogMessage(level = WARN)
@Message(id = 3027, value = "Failed loading HTTP messages strings")
@@ -495,8 +495,4 @@
@Message(id = 3104, value = "Error registering MBean %s")
void errorRegisteringMbean(Object objectName, @Cause Throwable t);
- @LogMessage(level = ERROR)
- @Message(id = 3105, value = "Error loading %s")
- void errorLoading(Object source);
-
}