remm        2005/04/24 03:28:38

  Modified:    util/java/org/apache/tomcat/util/net AprEndpoint.java
  Log:
  - Negativa values are now ok (apparently) for poll. (fixes a regression 
caused by yesterday's poll.c change)
  
  Revision  Changes    Path
  1.20      +0 -14     
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
  
  Index: AprEndpoint.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- AprEndpoint.java  23 Apr 2005 18:59:52 -0000      1.19
  +++ AprEndpoint.java  24 Apr 2005 10:28:38 -0000      1.20
  @@ -836,13 +836,6 @@
                               getWorkerThread().assign(desc[n*4+1], 
desc[n*4+2]);
                           }
                           maintainTime += pollTime;
  -                    } else if (rv < 0) {
  -                        // FIXME: Log with WARN at least
  -                        // Handle poll critical failure
  -                        synchronized (this) {
  -                            destroy();
  -                            init();
  -                        }
                       }
                       if (rv == 0 || maintainTime > 1000000L) {
                           synchronized (this) {
  @@ -1186,13 +1179,6 @@
                                   getWorkerThread().assign(desc[n*4+1], 
state.pool);
                               }
                           }
  -                    } else if (rv < 0) {
  -                        // Handle poll critical failure
  -                        // FIXME: Log with WARN at least
  -                        synchronized (this) {
  -                            destroy();
  -                            init();
  -                        }
                       }
                   } catch (Throwable t) {
                       // FIXME: Proper logging
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to