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

[do-not-reply at jboss.org]

Author: bradsdavis
Date: 2009-04-03 11:36:31 -0400 (Fri, 03 Apr 2009)
New Revision: 4414

Modified:
   jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/AddressFilter.java
   jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/WildCardAddressFilter.java
Log:
Create new collection rather than edit current.

Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/AddressFilter.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/AddressFilter.java	2009-04-03 15:30:53 UTC (rev 4413)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/AddressFilter.java	2009-04-03 15:36:31 UTC (rev 4414)
@@ -10,6 +10,6 @@
 	 * 
 	 * @param addresses Email Addresses to filter.
 	 */
-	public void filter(Collection<InternetAddress> addresses);
+	public Collection<InternetAddress> filter(final Collection<InternetAddress> addresses);
 
 }

Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/WildCardAddressFilter.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/WildCardAddressFilter.java	2009-04-03 15:30:53 UTC (rev 4413)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/WildCardAddressFilter.java	2009-04-03 15:36:31 UTC (rev 4414)
@@ -17,21 +17,22 @@
 	private Collection<String> includePatterns;
 	private Collection<String> excludePatterns;
 	
-	public void filter(Collection<InternetAddress> addresses)
+	public Collection<InternetAddress> filter(final Collection<InternetAddress> addresses)
 	{
-		Collection<InternetAddress> toRemove = new HashSet<InternetAddress>();
+		Collection<InternetAddress> filteredAddresses = new HashSet<InternetAddress>();
 		if(addresses!=null)
 		{
 			//Loop over for addresses to remove.
 			for(InternetAddress address : addresses)
 			{
-				if(!keepAddress(address))
+				if(keepAddress(address))
 				{
-					toRemove.add(address);
+					filteredAddresses.add(address);
 				}
 			}
-			addresses.removeAll(toRemove);
 		}
+		
+		return filteredAddresses;
 	}
 	
 	/***