[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/portlets/responseform EmailSender.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/portlets/responseform
In directory 
james.mmbase.org:/tmp/cvs-serv19684/portlets-dynamicforms/src/java/com/finalist/portlets/responseform

Modified Files:
        EmailSender.java 
Log Message:
CMSC-907 Code Quality with PMD
PMD error fixes


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/portlets/responseform
See also: http://www.mmbase.org/jira/browse/CMSC-907


Index: EmailSender.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/portlets/responseform/EmailSender.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- EmailSender.java    10 May 2008 16:32:16 -0000      1.3
+++ EmailSender.java    9 Jun 2008 21:23:06 -0000       1.4
@@ -6,16 +6,11 @@
 
 import javax.activation.DataHandler;
 import javax.activation.DataSource;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Multipart;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
+import javax.mail.*;
+import javax.mail.internet.*;
+
 import org.apache.commons.lang.StringUtils;
+
 import com.finalist.cmsc.mmbase.PropertiesUtil;
 
 /**
@@ -23,11 +18,12 @@
  * 
  * @author Cati Macarov
  */
-public class EmailSender {
+public final class EmailSender {
 
-   private static Properties props = new Properties();
    private static EmailSender instance = null;
-   private static String mailHost = null;
+
+   private Properties props = new Properties();
+   private String mailHost = null;
 
 
    /**
@@ -46,12 +42,15 @@
     */
    public static synchronized EmailSender getInstance() {
       String tempMailHost = PropertiesUtil.getProperty("mail.smtp.host");
-      if ((tempMailHost != null) && (!tempMailHost.equals(mailHost))) {
+      if (instance == null) {
          instance = new EmailSender(tempMailHost);
       }
-      if (instance == null) {
+      else {
+         if ((tempMailHost != null) && 
(!tempMailHost.equals(instance.mailHost))) {
          instance = new EmailSender(tempMailHost);
       }
+      }
+
       return instance;
    }
 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs