Author: fhanik
Date: Fri Aug 31 14:18:34 2007
New Revision: 571588
URL: http://svn.apache.org/viewvc?rev=571588&view=rev
Log:
don't create a comet event object until we are for certain that it is a comet
URI
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java?rev=571588&r1=571587&r2=571588&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java Fri Aug
31 14:18:34 2007
@@ -45,6 +45,7 @@
this.response = response;
//default behavior is to only listen for read events
register(CometOperation.OP_READ);
+ setWorkerThread();
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=571588&r1=571587&r2=571588&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Fri Aug
31 14:18:34 2007
@@ -305,14 +305,11 @@
// request parameters
req.getRequestProcessor().setWorkerThreadName(Thread.currentThread().getName());
if (postParseRequest(req, request, res, response)) {
- event = request.getEvent();
- if ( event!=null && (event instanceof CometEventImpl))
- ((CometEventImpl)event).setWorkerThread();
-
+
// Calling the container
connector.getContainer().getPipeline().getFirst().invoke(request, response);
-
if (request.isComet()) {
+ event = request.getEvent();
if (!response.isClosed() && !response.isError()) {
if (request.isAvailable() &&
request.hasOp(CometEvent.CometOperation.OP_READ)) {
// Invoke a read event right away if there are
available bytes
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
