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

[do-not-reply at jboss.org]

Author: bradsdavis
Date: 2009-04-09 10:25:18 -0400 (Thu, 09 Apr 2009)
New Revision: 4514

Modified:
   jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailSessionImpl.java
Log:
Added check for addressFilter being null.

Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailSessionImpl.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailSessionImpl.java	2009-04-09 10:11:42 UTC (rev 4513)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailSessionImpl.java	2009-04-09 14:25:18 UTC (rev 4514)
@@ -32,19 +32,25 @@
 
         // Need to apply filter.
         try {
-          Collection<InternetAddress> toFiltered = addressFilter.filter(to);
-          Collection<InternetAddress> ccFiltered = addressFilter.filter(cc);
-          Collection<InternetAddress> bccFiltered = addressFilter.filter(bcc);
-
-          // Set the email with the new filtered addresses.
-          email.setTo(toFiltered);
-          email.setCc(ccFiltered);
-          email.setBcc(bccFiltered);
-
-          // If there is someone to send it to, then send it.
-          if (!(toFiltered.isEmpty() && ccFiltered.isEmpty() && bccFiltered.isEmpty())) {
-            email.send();
+          if(addressFilter!=null) {
+	          Collection<InternetAddress> toFiltered = addressFilter.filter(to);
+	          Collection<InternetAddress> ccFiltered = addressFilter.filter(cc);
+	          Collection<InternetAddress> bccFiltered = addressFilter.filter(bcc);
+	
+	          // Set the email with the new filtered addresses.
+	          email.setTo(toFiltered);
+	          email.setCc(ccFiltered);
+	          email.setBcc(bccFiltered);
+	
+	          // If there is someone to send it to, then send it.
+	          if (!(toFiltered.isEmpty() && ccFiltered.isEmpty() && bccFiltered.isEmpty())) {
+	            email.send();
+	          }
           }
+          else {
+        	  //If no filter is set, then accept all.
+        	  email.send();
+          }
         }
         catch (EmailException e) {
           log.error("An exception occurred while sending email.", e);