cvs commit: jakarta-james/src/java/org/apache/james/smtpserver SMTPHandler.java

[hbedi]

hbedi       2002/10/17 15:04:01

  Modified:    src/java/org/apache/james/pop3server POP3Handler.java
               src/java/org/apache/james/smtpserver SMTPHandler.java
  Log:
  cleanup should happen in finally clause, not at the end of expected processing.
  
  Revision  Changes    Path
  1.14      +6 -4      
jakarta-james/src/java/org/apache/james/pop3server/POP3Handler.java
  
  Index: POP3Handler.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/pop3server/POP3Handler.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- POP3Handler.java  2 Oct 2002 06:12:02 -0000       1.13
  +++ POP3Handler.java  17 Oct 2002 22:04:00 -0000      1.14
  @@ -214,7 +214,6 @@
               while (parseCommand(in.readLine())) {
                   scheduler.resetTrigger(this.toString());
               }
  -            scheduler.removeTrigger(this.toString());
               if (getLogger().isInfoEnabled()) {
                   StringBuffer logBuffer =
                       new StringBuffer(128)
  @@ -241,9 +240,12 @@
               getLogger().error(exceptionBuffer.toString(), e );
               try {
                   socket.close();
  -            } catch (IOException ioe) {
  -            }
  -            // TODO: In the error condition, shouldn't we be removing the trigger?
  +            } catch (IOException ioe) {  }
  +
  +            // release from scheduler.
  +            try {
  +                scheduler.removeTrigger(this.toString());
  +            } catch(Throwable t) { }
           }
       }
   
  
  
  
  1.31      +5 -2      
jakarta-james/src/java/org/apache/james/smtpserver/SMTPHandler.java
  
  Index: SMTPHandler.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/smtpserver/SMTPHandler.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- SMTPHandler.java  2 Oct 2002 06:57:56 -0000       1.30
  +++ SMTPHandler.java  17 Oct 2002 22:04:01 -0000      1.31
  @@ -342,7 +342,6 @@
                   scheduler.resetTrigger(this.toString());
               }
               getLogger().debug("Closing socket.");
  -            scheduler.removeTrigger(this.toString());
           } catch (SocketException se) {
               if (getLogger().isDebugEnabled()) {
                   StringBuffer errorBuffer = 
  @@ -391,6 +390,10 @@
                                         + e.getMessage());
                   }
               }
  +            // release from scheduler.
  +            try {
  +                scheduler.removeTrigger(this.toString());
  +            } catch(Throwable t) { }
           }
       }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:james-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:james-dev-help@;jakarta.apache.org>