geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r569310 - in /geronimo/javamail/trunk: geronimo-javamail_1.3.1/geronimo-javamail_1.3.1_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/ geronimo-javamail_1.4/ geronimo-javamail_1.4/geronimo-javamail_1.4_mail/ geronimo-jav...
Date Fri, 24 Aug 2007 09:29:16 GMT
Author: rickmcguire
Date: Fri Aug 24 02:29:15 2007
New Revision: 569310

URL: http://svn.apache.org/viewvc?rev=569310&view=rev
Log:
GERONIMO-3427 STMP login fails if server sends multiple lines of response back from initial
connection.


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

Modified: geronimo/javamail/trunk/geronimo-javamail_1.3.1/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/geronimo-javamail_1.3.1_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java?rev=569310&r1=569309&r2=569310&view=diff
==============================================================================
--- geronimo/javamail/trunk/geronimo-javamail_1.3.1/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/geronimo-javamail_1.3.1_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java
Fri Aug 24 02:29:15 2007
@@ -1383,7 +1383,17 @@
      */
     protected boolean getWelcome() throws MessagingException {
         SMTPReply line = getReply();
-        return !line.isError();
+        // process any error now
+        if (line.isError()) {
+            return false; 
+        }
+        // Some servers send a multi-line welcome message.  Keep 
+        // reading lines until we hit the end of the response. 
+        while (line.isContinued()) {
+            line = getReply(); 
+        }
+        // this worked. 
+        return true; 
     }
 
     /**

Modified: geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_mail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_mail/pom.xml?rev=569310&r1=569309&r2=569310&view=diff
==============================================================================
--- geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_mail/pom.xml (original)
+++ geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_mail/pom.xml Fri Aug
24 02:29:15 2007
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.javamail</groupId>
         <artifactId>geronimo-javamail-1.4</artifactId>
-        <version>1.2</version>
+        <version>1.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

Modified: geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/pom.xml?rev=569310&r1=569309&r2=569310&view=diff
==============================================================================
--- geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/pom.xml (original)
+++ geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/pom.xml Fri
Aug 24 02:29:15 2007
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.javamail</groupId>
         <artifactId>geronimo-javamail-1.4</artifactId>
-        <version>1.2</version>
+        <version>1.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

Modified: geronimo/javamail/trunk/geronimo-javamail_1.4/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/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java?rev=569310&r1=569309&r2=569310&view=diff
==============================================================================
--- geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java
(original)
+++ geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java
Fri Aug 24 02:29:15 2007
@@ -1381,7 +1381,17 @@
      */
     protected boolean getWelcome() throws MessagingException {
         SMTPReply line = getReply();
-        return !line.isError();
+        // process any error now
+        if (line.isError()) {
+            return false; 
+        }
+        // Some servers send a multi-line welcome message.  Keep 
+        // reading lines until we hit the end of the response. 
+        while (line.isContinued()) {
+            line = getReply(); 
+        }
+        // this worked. 
+        return true; 
     }
 
     /**

Modified: geronimo/javamail/trunk/geronimo-javamail_1.4/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/javamail/trunk/geronimo-javamail_1.4/pom.xml?rev=569310&r1=569309&r2=569310&view=diff
==============================================================================
--- geronimo/javamail/trunk/geronimo-javamail_1.4/pom.xml (original)
+++ geronimo/javamail/trunk/geronimo-javamail_1.4/pom.xml Fri Aug 24 02:29:15 2007
@@ -35,7 +35,7 @@
     <name>Geronimo JavaMail</name>
     <packaging>pom</packaging>
 
-    <version>1.2</version>
+    <version>1.3-SNAPSHOT</version>
 
     <description>
         Geronimmo JavaMail provider.



Mime
View raw message