Index: java/org/apache/james/smtpserver/SMTPHandler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/smtpserver/SMTPHandler.java,v
retrieving revision 1.30
diff -u -r1.30 SMTPHandler.java
--- java/org/apache/james/smtpserver/SMTPHandler.java	2 Oct 2002 06:57:56 -0000	1.30
+++ java/org/apache/james/smtpserver/SMTPHandler.java	15 Oct 2002 07:59:47 -0000
@@ -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 scheduler.
+            try {
+                scheduler.removeTrigger(this.toString());
+            } catch(Throwable t) { }
         }
     }
 
@@ -1262,7 +1265,7 @@
                 }
                 mail.setRemoteHost(remoteHost);
                 mail.setRemoteAddr(remoteIP);
-                mailServer.sendMail(mail);
+                //mailServer.sendMail(mail);
                 if (getLogger().isDebugEnabled()) {
                     getLogger().debug("Successfully sent mail to spool: " + mail.getName());
                 }