Author: markt
Date: Mon Jul 9 12:21:26 2012
New Revision: 1359104
URL: http://svn.apache.org/viewvc?rev=1359104&view=rev
Log:
Fix NPE observed running unit tests with APR on Linux
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1359102
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1359104&r1=1359103&r2=1359104&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
Mon Jul 9 12:21:26 2012
@@ -249,11 +249,13 @@ public class Http11AprProtocol extends A
if (processor.isAsync()) {
// Async
socket.setAsync(true);
- } else if (processor.isComet() && proto.endpoint.isRunning()) {
+ } else if (processor.isComet()) {
// Comet
- ((AprEndpoint) proto.endpoint).getCometPoller().add(
- socket.getSocket().longValue(),
- proto.endpoint.getSoTimeout());
+ if (proto.endpoint.isRunning()) {
+ ((AprEndpoint) proto.endpoint).getCometPoller().add(
+ socket.getSocket().longValue(),
+ proto.endpoint.getSoTimeout());
+ }
} else {
// Upgraded
((AprEndpoint) proto.endpoint).getPoller().add(
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1359104&r1=1359103&r2=1359104&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jul 9 12:21:26 2012
@@ -75,6 +75,10 @@
HTTP and AJP connectors because any use of the option is either ignored
or in some cases (Java 7 with NIO) throws an Exception. (mark)
</fix>
+ <fix>
+ Prevent possible NPE when processing Comet requests during Connector
+ shutdown. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
