Blocking and non blocking is the only configuration option right now,

no need for the NO_IO option, as it can be controlled using the register/unregister options

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@542600 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/CometEvent.java b/java/org/apache/catalina/CometEvent.java
index f29e51f..06ed2fa 100644 (file)
--- a/java/org/apache/catalina/CometEvent.java
+++ b/java/org/apache/catalina/CometEvent.java
@@ -156,15 +156,15 @@ public interface CometEvent {
     
 
     /**
-     * COMET_NON_BLOCKING
+     * COMET_NON_BLOCKING<br/>
      * Option bit set for allowing non blocking IO
-     * when reading from the request or writing to the response
-     * COMET_NO_IO
-     * Option bit set to not register for any IO events
-     * Connections can be reregistered for IO events using the 
+     * when reading from the request or writing to the response<br/>
+     * COMET_BLOCKING<br/>
+     * Configure the comet connection for blocking IO, this is the default setting
+     * 
      * @see #configure(int)
      */
-    public enum CometConfiguration {COMET_NON_BLOCKING,COMET_NO_IO};
+    public enum CometConfiguration {COMET_BLOCKING, COMET_NON_BLOCKING};
         
     /**
      * Configures the connection for desired IO options.

diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java
index 84be8a4..9c04224 100644 (file)
--- a/java/org/apache/coyote/http11/Http11NioProcessor.java
+++ b/java/org/apache/coyote/http11/Http11NioProcessor.java
@@ -1226,12 +1226,12 @@ public class Http11NioProcessor implements ActionHook {
             int interest = getPollerInterest(param);
             NioEndpoint.KeyAttachment attach = (NioEndpoint.KeyAttachment)socket.getAttachment(false);
             attach.setCometOps(attach.getCometOps()|interest);
-            attach.getPoller().cometInterest(socket);
+            //notify poller if not on a tomcat thread
         } else if (actionCode == ActionCode.ACTION_COMET_UNREGISTER) {
             int interest = getPollerInterest(param);
             NioEndpoint.KeyAttachment attach = (NioEndpoint.KeyAttachment)socket.getAttachment(false);
             attach.setCometOps(attach.getCometOps()& (~interest));
-            attach.getPoller().cometInterest(socket);
+            //notify poller if not on a tomcat thread
         } else if (actionCode == ActionCode.ACTION_COMET_CONFIGURE) {
         }