Author: dblevins
Date: Tue Jan 26 20:03:11 2010
New Revision: 903392
URL: http://svn.apache.org/viewvc?rev=903392&view=rev
Log:
Potential fix for a nasty bug that I added with OPENEJB-1130: Stricter
ClientModule classpath discovery prevents possible NameAlreadyBoundException
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java?rev=903392&r1=903391&r2=903392&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
Tue Jan 26 20:03:11 2010
@@ -34,6 +34,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Set;
+import java.util.EnumSet;
/**
* @version $Rev$ $Date$
@@ -278,7 +279,7 @@
if (filterSystemApps){
unchecked =
unchecked.exclude(".*/openejb-[^/]+(.(jar|ear|war)(./)?|/target/classes/?)");
}
- processUrls(unchecked.getUrls(), classLoader,
requireDescriptors, base, jarList);
+ processUrls(unchecked.getUrls(), classLoader,
EnumSet.allOf(RequireDescriptors.class), base, jarList);
}
if (logger.isDebugEnabled()) {
