openmeetings-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From solo...@apache.org
Subject svn commit: r1452187 - /openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailHandler.java
Date Mon, 04 Mar 2013 05:22:41 GMT
Author: solomax
Date: Mon Mar  4 05:22:41 2013
New Revision: 1452187

URL: http://svn.apache.org/r1452187
Log:
mail.smtp.host changed as expected after configuration update

Modified:
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailHandler.java

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailHandler.java?rev=1452187&r1=1452186&r2=1452187&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailHandler.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailHandler.java
Mon Mar  4 05:22:41 2013
@@ -132,7 +132,7 @@ public class MailHandler {
 		if (smtpServer == null) {
 			init();
 		}
-		Properties props = System.getProperties();
+		Properties props = new Properties(System.getProperties());
 
 		props.put("mail.smtp.host", smtpServer);
 		props.put("mail.smtp.port", smtpPort);
@@ -147,10 +147,10 @@ public class MailHandler {
 				&& mailAuthPass != null && mailAuthPass.length() > 0) {
 			// use SMTP Authentication
 			props.put("mail.smtp.auth", "true");
-			session = Session.getDefaultInstance(props, new SmtpAuthenticator(mailAuthUser, mailAuthPass));
+			session = Session.getInstance(props, new SmtpAuthenticator(mailAuthUser, mailAuthPass));
 		} else {
 			// not use SMTP Authentication
-			session = Session.getDefaultInstance(props, null);
+			session = Session.getInstance(props, null);
 		}
 
 		// Building MimeMessage
@@ -190,7 +190,7 @@ public class MailHandler {
 	
 	public void send(final MailMessage m, boolean send) {
 		if (send) {
-			if (m.getId() != 0) {
+			if (m.getId() != null) {
 				m.setStatus(Status.SENDING);
 				mailMessageDao.update(m, null);
 			}
@@ -209,7 +209,7 @@ public class MailHandler {
 						m.setErrorCount(m.getErrorCount() + 1);
 						m.setStatus(m.getErrorCount() < MAXIMUM_ERROR_COUNT ? Status.NONE : Status.ERROR);
 					}
-					if (m.getId() != 0) {
+					if (m.getId() != null) {
 						mailMessageDao.update(m, null);
 					}
 				}



Mime
View raw message