Author: fhanik
Date: Mon Nov 24 03:32:02 2008
New Revision: 720173
URL: http://svn.apache.org/viewvc?rev=720173&view=rev
Log:
Fix NPE
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=720173&r1=720172&r2=720173&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Mon Nov
24 03:32:02 2008
@@ -1208,6 +1208,7 @@
} else if (actionCode == ActionCode.ACTION_COMET_END) {
comet = false;
} else if (actionCode == ActionCode.ACTION_COMET_CLOSE) {
+ if (socket==null || socket.getAttachment(false)==null) return;
NioEndpoint.KeyAttachment attach =
(NioEndpoint.KeyAttachment)socket.getAttachment(false);
attach.setCometOps(NioEndpoint.OP_CALLBACK);
//notify poller if not on a tomcat thread
@@ -1216,6 +1217,7 @@
socket.getPoller().cometInterest(socket);
} else if (actionCode == ActionCode.ACTION_COMET_SETTIMEOUT) {
if (param==null) return;
+ if (socket==null || socket.getAttachment(false)==null) return;
NioEndpoint.KeyAttachment attach =
(NioEndpoint.KeyAttachment)socket.getAttachment(false);
long timeout = ((Long)param).longValue();
//if we are not piggy backing on a worker thread, set the timeout
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
