geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r515522 - in /geronimo/javamail/trunk: geronimo-javamail_1.3.1_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/ geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/
Date Wed, 07 Mar 2007 10:42:31 GMT
Author: rickmcguire
Date: Wed Mar  7 02:42:30 2007
New Revision: 515522

URL: http://svn.apache.org/viewvc?view=rev&rev=515522
Log:
GERONIMO-2938 javamail SMTPTransport has interpretation of mail.smtp.quitwait option wrong.


Modified:
    geronimo/javamail/trunk/geronimo-javamail_1.3.1_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java
    geronimo/javamail/trunk/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java

Modified: geronimo/javamail/trunk/geronimo-javamail_1.3.1_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java
URL: http://svn.apache.org/viewvc/geronimo/javamail/trunk/geronimo-javamail_1.3.1_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java?view=diff&rev=515522&r1=515521&r2=515522
==============================================================================
--- geronimo/javamail/trunk/geronimo-javamail_1.3.1_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java
(original)
+++ geronimo/javamail/trunk/geronimo-javamail_1.3.1_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java
Wed Mar  7 02:42:30 2007
@@ -1450,14 +1450,15 @@
      */
     protected void sendQuit() throws MessagingException {
         // there's yet another property that controls whether we should wait for
-        // a
-        // reply for a QUIT command. If on, just send the command and get outta
-        // here.
+        // a reply for a QUIT command. If true, we're suppposed to wait for a response 
+        // from the QUIT command.  Otherwise we just send the QUIT and bail.  The default

+        // is "false"
         if (isProtocolPropertyTrue(MAIL_SMTP_QUITWAIT)) {
-            sendLine("QUIT");
-        } else {
             // handle as a real command...we're going to ignore the response.
             sendCommand("QUIT");
+        } else {
+            // just send the command without waiting for a response. 
+            sendLine("QUIT");
         }
     }
 

Modified: geronimo/javamail/trunk/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java
URL: http://svn.apache.org/viewvc/geronimo/javamail/trunk/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java?view=diff&rev=515522&r1=515521&r2=515522
==============================================================================
--- geronimo/javamail/trunk/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java
(original)
+++ geronimo/javamail/trunk/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java
Wed Mar  7 02:42:30 2007
@@ -1448,14 +1448,15 @@
      */
     protected void sendQuit() throws MessagingException {
         // there's yet another property that controls whether we should wait for
-        // a
-        // reply for a QUIT command. If on, just send the command and get outta
-        // here.
+        // a reply for a QUIT command. If true, we're suppposed to wait for a response 
+        // from the QUIT command.  Otherwise we just send the QUIT and bail.  The default

+        // is "false"
         if (isProtocolPropertyTrue(MAIL_SMTP_QUITWAIT)) {
-            sendLine("QUIT");
-        } else {
             // handle as a real command...we're going to ignore the response.
             sendCommand("QUIT");
+        } else {
+            // just send the command without waiting for a response. 
+            sendLine("QUIT");
         }
     }
 



Mime
View raw message