svn commit: r542235 - /tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java

[fh...@apache.org]

Author: fhanik
Date: Mon May 28 07:18:04 2007
New Revision: 542235

URL: http://svn.apache.org/viewvc?view=rev&rev=542235
Log:
configure can be called as long as we are on a tomcat thread, not in the begin stage

Modified:
    tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.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?view=diff&rev=542235&r1=542234&r2=542235
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java Mon May 28 07:18:04 2007
@@ -119,13 +119,11 @@
         return response.getResponse();
     }
 
-    public void setTimeout(int timeout) throws IOException, ServletException,
-            UnsupportedOperationException {
+    public void setTimeout(int timeout) throws IOException, ServletException,UnsupportedOperationException {
+        //this check should get removed as soon as connection timeout is implemented everywhere.
         if (request.getAttribute("org.apache.tomcat.comet.timeout.support") == Boolean.TRUE) {
             checkWorkerThread();
-            Integer to = new Integer(timeout);
-            request.action(ActionCode.ACTION_COMET_TIMEOUT,to);
-            //request.setAttribute("org.apache.tomcat.comet.timeout", to);
+            request.action(ActionCode.ACTION_COMET_TIMEOUT,new Integer(timeout));
         } else {
             throw new UnsupportedOperationException();
         }
@@ -142,9 +140,6 @@
     public void configure(CometEvent.CometConfiguration... options)
         throws IOException, IllegalStateException {
         checkWorkerThread();
-        if (getEventType()!=EventType.BEGIN) {
-            throw new IllegalStateException("Configure can only be called during the BEGIN event.");
-        }
         throw new UnsupportedOperationException();
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org