geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r482370 - 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 Mon, 04 Dec 2006 21:36:33 GMT
Author: rickmcguire
Date: Mon Dec  4 13:36:32 2006
New Revision: 482370

URL: http://svn.apache.org/viewvc?view=rev&rev=482370
Log:
GERONIMO-2623 Infinite loop in the SMTPTransport code when a socket factory class is used.


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=482370&r1=482369&r2=482370
==============================================================================
--- 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
Mon Dec  4 13:36:32 2006
@@ -1251,6 +1251,8 @@
                         Object[] createSocketArgs = new Object[] { host, portArg };
                         socket = (Socket) createSocket.invoke(defFactory, createSocketArgs);
                     }
+                    // now break out and configure the socket.
+                    break;
                 } catch (Throwable e) {
                     // if we're allowed to fallback, then use the default
                     // factory and try this again. We only

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=482370&r1=482369&r2=482370
==============================================================================
--- 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
Mon Dec  4 13:36:32 2006
@@ -1251,6 +1251,8 @@
                         Object[] createSocketArgs = new Object[] { host, portArg };
                         socket = (Socket) createSocket.invoke(defFactory, createSocketArgs);
                     }
+                    // now break out and configure the socket.
+                    break;
                 } catch (Throwable e) {
                     // if we're allowed to fallback, then use the default
                     // factory and try this again. We only



Mime
View raw message