Author: fhanik
Date: Tue May 29 10:52:36 2007
New Revision: 542600
URL: http://svn.apache.org/viewvc?view=rev&rev=542600
Log:
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
Modified:
tomcat/trunk/java/org/apache/catalina/CometEvent.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Modified: tomcat/trunk/java/org/apache/catalina/CometEvent.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/CometEvent.java?view=diff&rev=542600&r1=542599&r2=542600
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/CometEvent.java (original)
+++ tomcat/trunk/java/org/apache/catalina/CometEvent.java Tue May 29 10:52:36
2007
@@ -156,15 +156,15 @@
/**
- * 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.
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?view=diff&rev=542600&r1=542599&r2=542600
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Tue May
29 10:52:36 2007
@@ -1226,12 +1226,12 @@
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) {
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
