Author: markt
Date: Mon Jul 9 12:18:21 2012
New Revision: 1359102
URL: http://svn.apache.org/viewvc?rev=1359102&view=rev
Log:
Fix NPE observed running unit tests with APR on Linux
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1359102&r1=1359101&r2=1359102&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Mon Jul
9 12:18:21 2012
@@ -280,10 +280,13 @@ public class Http11AprProtocol extends A
if (processor.isAsync()) {
// Async
socket.setAsync(true);
- } else if (processor.isComet() && proto.endpoint.isRunning()) {
- ((AprEndpoint) proto.endpoint).getCometPoller().add(
- socket.getSocket().longValue(),
- proto.endpoint.getSoTimeout());
+ } else if (processor.isComet()) {
+ // Comet
+ if (proto.endpoint.isRunning()) {
+ ((AprEndpoint) proto.endpoint).getCometPoller().add(
+ socket.getSocket().longValue(),
+ proto.endpoint.getSoTimeout());
+ }
} else {
// Upgraded
((AprEndpoint) proto.endpoint).getPoller().add(
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
