[jbpm-commits] JBoss JBPM SVN: r4439 - jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/server.

[do-not-reply at jboss.org]

Author: bradsdavis
Date: 2009-04-03 17:07:51 -0400 (Fri, 03 Apr 2009)
New Revision: 4439

Modified:
   jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/server/SmtpServer.java
Log:
changed since all properties can be provided by the config in one place.

Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/server/SmtpServer.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/server/SmtpServer.java	2009-04-03 20:56:46 UTC (rev 4438)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/server/SmtpServer.java	2009-04-03 21:07:51 UTC (rev 4439)
@@ -1,6 +1,5 @@
 package org.jbpm.pvm.internal.email.server;
 
-import java.util.Map;
 import java.util.Properties;
 
 import javax.mail.Session;
@@ -15,28 +14,9 @@
 public class SmtpServer {
 	//Allow injection.
 	protected Properties properties;
-	//Allow manual override.
-	protected Map<String,Object> mailProperties;
 	
 	public Session createSmtpSession()
 	{
-		return Session.getDefaultInstance(this.generateProperties(), null);
+		return Session.getDefaultInstance(properties, null);
 	}
-	
-	protected Properties generateProperties()
-	{
-		Properties mailServerProperties = new Properties();
-		if(properties!=null)
-		{
-			return properties;
-		}
-		if(mailProperties!=null)
-		{
-			for(String key : mailProperties.keySet())
-			{
-				mailServerProperties.put(key, properties.get(key));
-			}
-		}
-		return mailServerProperties;
-	}
 }