You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2006/10/26 15:02:27 UTC

svn commit: r467985 - in /geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail: IMAPStoreGBean.java NNTPStoreGBean.java NNTPTransportGBean.java POP3StoreGBean.java SMTPSTransportGBean.java SMTPTransportGBean.java

Author: rickmcguire
Date: Thu Oct 26 06:02:26 2006
New Revision: 467985

URL: http://svn.apache.org/viewvc?view=rev&rev=467985
Log:
GERONIMO-2520 The ProtocolGBeans not handling Boolean properties correctly in addOverrides().


Modified:
    geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/IMAPStoreGBean.java
    geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPStoreGBean.java
    geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPTransportGBean.java
    geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/POP3StoreGBean.java
    geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPSTransportGBean.java
    geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPTransportGBean.java

Modified: geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/IMAPStoreGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/IMAPStoreGBean.java?view=diff&rev=467985&r1=467984&r2=467985
==============================================================================
--- geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/IMAPStoreGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/IMAPStoreGBean.java Thu Oct 26 06:02:26 2006
@@ -766,28 +766,28 @@
     public void addOverrides(Properties props) {
         super.addOverrides(props);
 
-        if (port != null) props.put(IMAP_PORT, port);
-        if (partialFetch != null) props.put(IMAP_PARTIAL_FETCH, partialFetch);
-        if (fetchSize != null) props.put(IMAP_FETCH_SIZE, fetchSize);
-        if (connectionTimeout != null) props.put(IMAP_CONNECTION_TIMEOUT, connectionTimeout);
-        if (timeout != null) props.put(IMAP_TIMEOUT, timeout);
-        if (statusCacheTimeout != null) props.put(IMAP_STATUS_TIMEOUT, statusCacheTimeout);
-        if (appendBufferSize != null) props.put(IMAP_APPEND_SIZE, appendBufferSize);
-        if (connectionPoolSize != null) props.put(IMAP_POOL_SIZE, connectionPoolSize);
-        if (connectionPoolTimeout != null) props.put(IMAP_POOL_TIMEOUT, connectionPoolTimeout);
-        if (separateStoreConnection != null) props.put(IMAP_SEPARATE_STORE_CONNECTION, separateStoreConnection);
-        if (allowReadOnlySelect != null) props.put(IMAP_READONLY_SELECT, allowReadOnlySelect);
-        if (authLoginDisable != null) props.put(IMAP_LOGIN_DISABLE, authLoginDisable);
-        if (authPlainDisable != null) props.put(IMAP_PLAIN_DISABLE, authPlainDisable);
-        if (startTLSEnable != null) props.put(IMAP_STARTTLS_ENABLE, startTLSEnable);
-        if (localaddress != null) props.put(IMAP_LOCALADDRESS, localaddress);
-        if (localport != null) props.put(IMAP_LOCALPORT, localport);
-        if (saslEnable != null) props.put(IMAP_SASL_ENABLE, saslEnable);
-        if (saslMechanisms != null) props.put(IMAP_SASL_MECHANISMS, saslMechanisms);
-        if (saslAuthorizationId != null) props.put(IMAP_SASL_AUTHORIZATIONID, saslAuthorizationId);
-        if (socketFactoryClass != null) props.put(IMAP_FACTORY_CLASS, socketFactoryClass);
-        if (socketFactoryFallback != null) props.put(IMAP_FACTORY_FALLBACK, socketFactoryFallback);
-        if (socketFactoryPort != null) props.put(IMAP_FACTORY_PORT, socketFactoryPort);
+        if (port != null) props.setProperty(IMAP_PORT, port.toString());
+        if (partialFetch != null) props.setProperty(IMAP_PARTIAL_FETCH, partialFetch.toString());
+        if (fetchSize != null) props.setProperty(IMAP_FETCH_SIZE, fetchSize.toString());
+        if (connectionTimeout != null) props.setProperty(IMAP_CONNECTION_TIMEOUT, connectionTimeout.toString());
+        if (timeout != null) props.setProperty(IMAP_TIMEOUT, timeout.toString());
+        if (statusCacheTimeout != null) props.setProperty(IMAP_STATUS_TIMEOUT, statusCacheTimeout.toString());
+        if (appendBufferSize != null) props.setProperty(IMAP_APPEND_SIZE, appendBufferSize.toString());
+        if (connectionPoolSize != null) props.setProperty(IMAP_POOL_SIZE, connectionPoolSize.toString());
+        if (connectionPoolTimeout != null) props.setProperty(IMAP_POOL_TIMEOUT, connectionPoolTimeout.toString());
+        if (separateStoreConnection != null) props.setProperty(IMAP_SEPARATE_STORE_CONNECTION, separateStoreConnection.toString());
+        if (allowReadOnlySelect != null) props.setProperty(IMAP_READONLY_SELECT, allowReadOnlySelect.toString());
+        if (authLoginDisable != null) props.setProperty(IMAP_LOGIN_DISABLE, authLoginDisable.toString());
+        if (authPlainDisable != null) props.setProperty(IMAP_PLAIN_DISABLE, authPlainDisable.toString());
+        if (startTLSEnable != null) props.setProperty(IMAP_STARTTLS_ENABLE, startTLSEnable.toString());
+        if (localaddress != null) props.setProperty(IMAP_LOCALADDRESS, localaddress);
+        if (localport != null) props.setProperty(IMAP_LOCALPORT, localport.toString());
+        if (saslEnable != null) props.setProperty(IMAP_SASL_ENABLE, saslEnable.toString());
+        if (saslMechanisms != null) props.setProperty(IMAP_SASL_MECHANISMS, saslMechanisms);
+        if (saslAuthorizationId != null) props.setProperty(IMAP_SASL_AUTHORIZATIONID, saslAuthorizationId);
+        if (socketFactoryClass != null) props.setProperty(IMAP_FACTORY_CLASS, socketFactoryClass);
+        if (socketFactoryFallback != null) props.setProperty(IMAP_FACTORY_FALLBACK, socketFactoryFallback.toString());
+        if (socketFactoryPort != null) props.setProperty(IMAP_FACTORY_PORT, socketFactoryPort.toString());
     }
 
     public void doStart() throws Exception {

Modified: geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPStoreGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPStoreGBean.java?view=diff&rev=467985&r1=467984&r2=467985
==============================================================================
--- geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPStoreGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPStoreGBean.java Thu Oct 26 06:02:26 2006
@@ -319,15 +319,15 @@
     public void addOverrides(Properties props) {
         super.addOverrides(props);
 
-        if (port != null) props.put(NNTPS_PORT, port);
-        if (connectionTimeout != null) props.put(NNTPS_CONNECTION_TIMEOUT, connectionTimeout);
-        if (timeout != null) props.put(NNTPS_TIMEOUT, timeout);
-        if (auth != null) props.put(NNTPS_AUTH, auth);
-        if (saslRealm != null) props.put(NNTPS_REALM, saslRealm);
-        if (quitWait != null) props.put(NNTPS_QUITWAIT, quitWait);
-        if (socketFactoryClass != null) props.put(NNTPS_FACTORY_CLASS, socketFactoryClass);
-        if (socketFactoryFallback != null) props.put(NNTPS_FACTORY_FALLBACK, socketFactoryFallback);
-        if (socketFactoryPort != null) props.put(NNTPS_FACTORY_PORT, socketFactoryPort);
+        if (port != null) props.setProperty(NNTPS_PORT, port.toString());
+        if (connectionTimeout != null) props.setProperty(NNTPS_CONNECTION_TIMEOUT, connectionTimeout.toString());
+        if (timeout != null) props.setProperty(NNTPS_TIMEOUT, timeout.toString());
+        if (auth != null) props.setProperty(NNTPS_AUTH, auth.toString());
+        if (saslRealm != null) props.setProperty(NNTPS_REALM, saslRealm);
+        if (quitWait != null) props.setProperty(NNTPS_QUITWAIT, quitWait.toString());
+        if (socketFactoryClass != null) props.setProperty(NNTPS_FACTORY_CLASS, socketFactoryClass);
+        if (socketFactoryFallback != null) props.setProperty(NNTPS_FACTORY_FALLBACK, socketFactoryFallback.toString());
+        if (socketFactoryPort != null) props.setProperty(NNTPS_FACTORY_PORT, socketFactoryPort.toString());
     }
 
     public void doStart() throws Exception {

Modified: geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPTransportGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPTransportGBean.java?view=diff&rev=467985&r1=467984&r2=467985
==============================================================================
--- geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPTransportGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPTransportGBean.java Thu Oct 26 06:02:26 2006
@@ -344,16 +344,16 @@
     public void addOverrides(Properties props) {
         super.addOverrides(props);
 
-        if (port != null) props.put(NNTP_PORT, port);
-        if (connectionTimeout != null) props.put(NNTP_CONNECTION_TIMEOUT, connectionTimeout);
-        if (timeout != null) props.put(NNTP_TIMEOUT, timeout);
-        if (from != null) props.put(NNTP_FROM, from);
-        if (auth != null) props.put(NNTP_AUTH, auth);
-        if (saslRealm != null) props.put(NNTP_REALM, saslRealm);
-        if (quitWait != null) props.put(NNTP_QUITWAIT, quitWait);
-        if (socketFactoryClass != null) props.put(NNTP_FACTORY_CLASS, socketFactoryClass);
-        if (socketFactoryFallback != null) props.put(NNTP_FACTORY_FALLBACK, socketFactoryFallback);
-        if (socketFactoryPort != null) props.put(NNTP_FACTORY_PORT, socketFactoryPort);
+        if (port != null) props.setProperty(NNTP_PORT, port.toString());
+        if (connectionTimeout != null) props.setProperty(NNTP_CONNECTION_TIMEOUT, connectionTimeout.toString());
+        if (timeout != null) props.setProperty(NNTP_TIMEOUT, timeout.toString());
+        if (from != null) props.setProperty(NNTP_FROM, from);
+        if (auth != null) props.setProperty(NNTP_AUTH, auth.toString());
+        if (saslRealm != null) props.setProperty(NNTP_REALM, saslRealm);
+        if (quitWait != null) props.setProperty(NNTP_QUITWAIT, quitWait.toString());
+        if (socketFactoryClass != null) props.setProperty(NNTP_FACTORY_CLASS, socketFactoryClass);
+        if (socketFactoryFallback != null) props.setProperty(NNTP_FACTORY_FALLBACK, socketFactoryFallback.toString());
+        if (socketFactoryPort != null) props.setProperty(NNTP_FACTORY_PORT, socketFactoryPort.toString());
     }
 
     public void doStart() throws Exception {

Modified: geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/POP3StoreGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/POP3StoreGBean.java?view=diff&rev=467985&r1=467984&r2=467985
==============================================================================
--- geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/POP3StoreGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/POP3StoreGBean.java Thu Oct 26 06:02:26 2006
@@ -416,17 +416,17 @@
     public void addOverrides(Properties props) {
         super.addOverrides(props);
 
-        if (port != null) props.put(POP3_PORT, port);
-        if (connectionTimeout != null) props.put(POP3_CONNECTION_TIMEOUT, connectionTimeout);
-        if (timeout != null) props.put(POP3_TIMEOUT, timeout);
-        if (rsetBeforeQuit != null) props.put(POP3_RESET, rsetBeforeQuit);
-        if (messageClass != null) props.put(POP3_MESSAGE_CLASS, messageClass);
-        if (localaddress != null) props.put(POP3_LOCALADDRESS, localaddress);
-        if (localport != null) props.put(POP3_LOCALPORT, localport);
-        if (apopEnable != null) props.put(POP3_APOP, apopEnable);
-        if (socketFactoryClass != null) props.put(POP3_FACTORY_CLASS, socketFactoryClass);
-        if (socketFactoryFallback != null) props.put(POP3_FACTORY_FALLBACK, socketFactoryFallback);
-        if (socketFactoryPort != null) props.put(POP3_FACTORY_PORT, socketFactoryPort);
+        if (port != null) props.setProperty(POP3_PORT, port.toString());
+        if (connectionTimeout != null) props.setProperty(POP3_CONNECTION_TIMEOUT, connectionTimeout.toString());
+        if (timeout != null) props.setProperty(POP3_TIMEOUT, timeout.toString());
+        if (rsetBeforeQuit != null) props.setProperty(POP3_RESET, rsetBeforeQuit.toString());
+        if (messageClass != null) props.setProperty(POP3_MESSAGE_CLASS, messageClass);
+        if (localaddress != null) props.setProperty(POP3_LOCALADDRESS, localaddress);
+        if (localport != null) props.setProperty(POP3_LOCALPORT, localport.toString());
+        if (apopEnable != null) props.setProperty(POP3_APOP, apopEnable.toString());
+        if (socketFactoryClass != null) props.setProperty(POP3_FACTORY_CLASS, socketFactoryClass);
+        if (socketFactoryFallback != null) props.setProperty(POP3_FACTORY_FALLBACK, socketFactoryFallback.toString());
+        if (socketFactoryPort != null) props.setProperty(POP3_FACTORY_PORT, socketFactoryPort.toString());
     }
 
     public void doStart() throws Exception {

Modified: geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPSTransportGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPSTransportGBean.java?view=diff&rev=467985&r1=467984&r2=467985
==============================================================================
--- geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPSTransportGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPSTransportGBean.java Thu Oct 26 06:02:26 2006
@@ -767,28 +767,28 @@
     public void addOverrides(Properties props) {
         super.addOverrides(props);
 
-        if (port != null) props.put(SMTPS_PORT, port);
-        if (connectionTimeout != null) props.put(SMTPS_CONNECTION_TIMEOUT, connectionTimeout);
-        if (timeout != null) props.put(SMTPS_TIMEOUT, timeout);
-        if (from != null) props.put(SMTPS_FROM, from);
-        if (localhost != null) props.put(SMTPS_LOCALHOST, localhost);
-        if (localaddress != null) props.put(SMTPS_LOCALADDRESS, localaddress);
-        if (localport != null) props.put(SMTPS_LOCALPORT, localport);
-        if (ehlo != null) props.put(SMTPS_EHLO, ehlo);
-        if (auth != null) props.put(SMTPS_AUTH, auth);
-        if (startTLSEnable != null) props.put(SMTPS_STARTTLS_ENABLE, startTLSEnable);
-        if (submitter != null) props.put(SMTPS_SUBMITTER, submitter);
-        if (dsnNotify != null) props.put(SMTPS_DSN_NOTIFY, dsnNotify);
-        if (dsnRet != null) props.put(SMTPS_DSN_RET, dsnRet);
-        if (allow8bitmime != null) props.put(SMTPS_8BITMIME, allow8bitmime);
-        if (sendPartial != null) props.put(SMTPS_SEND_PARTIAL, sendPartial);
-        if (saslRealm != null) props.put(SMTPS_REALM, saslRealm);
-        if (quitWait != null) props.put(SMTPS_QUITWAIT, quitWait);
-        if (reportSuccess != null) props.put(SMTPS_REPORT_SUCCESS, reportSuccess);
-        if (socketFactoryClass != null) props.put(SMTPS_FACTORY_CLASS, socketFactoryClass);
-        if (socketFactoryFallback != null) props.put(SMTPS_FACTORY_FALLBACK, socketFactoryFallback);
-        if (socketFactoryPort != null) props.put(SMTPS_FACTORY_PORT, socketFactoryPort);
-        if (mailExtension != null) props.put(SMTPS_MAIL_EXTENSION, mailExtension);
+        if (port != null) props.setProperty(SMTPS_PORT, port.toString());
+        if (connectionTimeout != null) props.setProperty(SMTPS_CONNECTION_TIMEOUT, connectionTimeout.toString());
+        if (timeout != null) props.setProperty(SMTPS_TIMEOUT, timeout.toString());
+        if (from != null) props.setProperty(SMTPS_FROM, from);
+        if (localhost != null) props.setProperty(SMTPS_LOCALHOST, localhost);
+        if (localaddress != null) props.setProperty(SMTPS_LOCALADDRESS, localaddress);
+        if (localport != null) props.setProperty(SMTPS_LOCALPORT, localport.toString());
+        if (ehlo != null) props.setProperty(SMTPS_EHLO, ehlo.toString());
+        if (auth != null) props.setProperty(SMTPS_AUTH, auth.toString());
+        if (startTLSEnable != null) props.setProperty(SMTPS_STARTTLS_ENABLE, startTLSEnable.toString());
+        if (submitter != null) props.setProperty(SMTPS_SUBMITTER, submitter);
+        if (dsnNotify != null) props.setProperty(SMTPS_DSN_NOTIFY, dsnNotify.toString());
+        if (dsnRet != null) props.setProperty(SMTPS_DSN_RET, dsnRet.toString());
+        if (allow8bitmime != null) props.setProperty(SMTPS_8BITMIME, allow8bitmime.toString());
+        if (sendPartial != null) props.setProperty(SMTPS_SEND_PARTIAL, sendPartial.toString());
+        if (saslRealm != null) props.setProperty(SMTPS_REALM, saslRealm);
+        if (quitWait != null) props.setProperty(SMTPS_QUITWAIT, quitWait.toString());
+        if (reportSuccess != null) props.setProperty(SMTPS_REPORT_SUCCESS, reportSuccess.toString());
+        if (socketFactoryClass != null) props.setProperty(SMTPS_FACTORY_CLASS, socketFactoryClass);
+        if (socketFactoryFallback != null) props.setProperty(SMTPS_FACTORY_FALLBACK, socketFactoryFallback.toString());
+        if (socketFactoryPort != null) props.setProperty(SMTPS_FACTORY_PORT, socketFactoryPort.toString());
+        if (mailExtension != null) props.setProperty(SMTPS_MAIL_EXTENSION, mailExtension);
     }
 
     public void doStart() throws Exception {

Modified: geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPTransportGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPTransportGBean.java?view=diff&rev=467985&r1=467984&r2=467985
==============================================================================
--- geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPTransportGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPTransportGBean.java Thu Oct 26 06:02:26 2006
@@ -768,28 +768,28 @@
     public void addOverrides(Properties props) {
         super.addOverrides(props);
 
-        if (port != null) props.put(SMTP_PORT, port);
-        if (connectionTimeout != null) props.put(SMTP_CONNECTION_TIMEOUT, connectionTimeout);
-        if (timeout != null) props.put(SMTP_TIMEOUT, timeout);
-        if (from != null) props.put(SMTP_FROM, from);
-        if (localhost != null) props.put(SMTP_LOCALHOST, localhost);
-        if (localaddress != null) props.put(SMTP_LOCALADDRESS, localaddress);
-        if (localport != null) props.put(SMTP_LOCALPORT, localport);
-        if (ehlo != null) props.put(SMTP_EHLO, ehlo);
-        if (auth != null) props.put(SMTP_AUTH, auth);
-        if (startTLSEnable != null) props.put(SMTP_STARTTLS_ENABLE, startTLSEnable);
-        if (submitter != null) props.put(SMTP_SUBMITTER, submitter);
-        if (dsnNotify != null) props.put(SMTP_DSN_NOTIFY, dsnNotify);
-        if (dsnRet != null) props.put(SMTP_DSN_RET, dsnRet);
-        if (allow8bitmime != null) props.put(SMTP_8BITMIME, allow8bitmime);
-        if (sendPartial != null) props.put(SMTP_SEND_PARTIAL, sendPartial);
-        if (saslRealm != null) props.put(SMTP_REALM, saslRealm);
-        if (quitWait != null) props.put(SMTP_QUITWAIT, quitWait);
-        if (reportSuccess != null) props.put(SMTP_REPORT_SUCCESS, reportSuccess);
-        if (socketFactoryClass != null) props.put(SMTP_FACTORY_CLASS, socketFactoryClass);
-        if (socketFactoryFallback != null) props.put(SMTP_FACTORY_FALLBACK, socketFactoryFallback);
-        if (socketFactoryPort != null) props.put(SMTP_FACTORY_PORT, socketFactoryPort);
-        if (mailExtension != null) props.put(SMTP_MAIL_EXTENSION, mailExtension);
+        if (port != null) props.setProperty(SMTP_PORT, port.toString());
+        if (connectionTimeout != null) props.setProperty(SMTP_CONNECTION_TIMEOUT, connectionTimeout.toString());
+        if (timeout != null) props.setProperty(SMTP_TIMEOUT, timeout.toString());
+        if (from != null) props.setProperty(SMTP_FROM, from);
+        if (localhost != null) props.setProperty(SMTP_LOCALHOST, localhost);
+        if (localaddress != null) props.setProperty(SMTP_LOCALADDRESS, localaddress);
+        if (localport != null) props.setProperty(SMTP_LOCALPORT, localport.toString());
+        if (ehlo != null) props.setProperty(SMTP_EHLO, ehlo.toString());
+        if (auth != null) props.setProperty(SMTP_AUTH, auth.toString());
+        if (startTLSEnable != null) props.setProperty(SMTP_STARTTLS_ENABLE, startTLSEnable.toString());
+        if (submitter != null) props.setProperty(SMTP_SUBMITTER, submitter);
+        if (dsnNotify != null) props.setProperty(SMTP_DSN_NOTIFY, dsnNotify);
+        if (dsnRet != null) props.setProperty(SMTP_DSN_RET, dsnRet);
+        if (allow8bitmime != null) props.setProperty(SMTP_8BITMIME, allow8bitmime.toString());
+        if (sendPartial != null) props.setProperty(SMTP_SEND_PARTIAL, sendPartial.toString());
+        if (saslRealm != null) props.setProperty(SMTP_REALM, saslRealm);
+        if (quitWait != null) props.setProperty(SMTP_QUITWAIT, quitWait.toString());
+        if (reportSuccess != null) props.setProperty(SMTP_REPORT_SUCCESS, reportSuccess.toString());
+        if (socketFactoryClass != null) props.setProperty(SMTP_FACTORY_CLASS, socketFactoryClass);
+        if (socketFactoryFallback != null) props.setProperty(SMTP_FACTORY_FALLBACK, socketFactoryFallback.toString());
+        if (socketFactoryPort != null) props.setProperty(SMTP_FACTORY_PORT, socketFactoryPort.toString());
+        if (mailExtension != null) props.setProperty(SMTP_MAIL_EXTENSION, mailExtension);
     }
 
     public void doStart() throws Exception {