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

[do-not-reply at jboss.org]

Author: bradsdavis
Date: 2009-04-07 14:43:50 -0400 (Tue, 07 Apr 2009)
New Revision: 4485

Modified:
   jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/SimpleMailProducer.java
Log:
Checked null for mail context to/cc/bcc/actors/groups.

Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/SimpleMailProducer.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/SimpleMailProducer.java	2009-04-07 17:10:43 UTC (rev 4484)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/SimpleMailProducer.java	2009-04-07 18:43:50 UTC (rev 4485)
@@ -41,34 +41,48 @@
 	protected void populateAddresses(MailContext mailContext, Email email) throws EmailException
 	{
 		//Add the addresses.
-		for(String a : mailContext.getToAddresses())
+		if(mailContext.getToAddresses()!=null)
 		{
-			email.addTo(a);
+			for(String a : mailContext.getToAddresses())
+			{
+				email.addTo(a);
+			}
 		}
-		for(String a : mailContext.getCcAddresses())
+		if(mailContext.getCcAddresses()!=null)
 		{
-			email.addCc(a);
+			for(String a : mailContext.getCcAddresses())
+			{
+				email.addCc(a);
+			}
 		}
-		for(String a : mailContext.getBccAddresses())
+		if(mailContext.getBccAddresses()!=null)
 		{
-			email.addBcc(a);
+			for(String a : mailContext.getBccAddresses())
+			{
+				email.addBcc(a);
+			}
 		}
-		
 		//Get address resolver.
 		AddressResolver resolver = Environment.getFromCurrent(AddressResolver.class);;
 		
 		//Resolve actors and groups.
-		for(User user : mailContext.getActors())
+		if(mailContext.getActors()!=null)
 		{
-			InternetAddress address = resolver.resolveUserAddress(user);
-			email.addTo(address.getAddress(), this.constructName(user));
+			for(User user : mailContext.getActors())
+			{
+				InternetAddress address = resolver.resolveUserAddress(user);
+				email.addTo(address.getAddress(), this.constructName(user));
+			}
 		}
-		for(Group group : mailContext.getGroups())
+		if(mailContext.getGroups()!=null)
 		{
-			Collection<InternetAddress> addresses = resolver.resolveGroupAddresses(group);
-			for(InternetAddress address : addresses)
+			for(Group group : mailContext.getGroups())
 			{
-				email.addTo(address.getAddress());
+				Collection<InternetAddress> addresses = resolver.resolveGroupAddresses(group);
+				for(InternetAddress address : addresses)
+				{
+					email.addTo(address.getAddress());
+				}
 			}
 		}
 	}