Author: jlaskowski Date: Sat Sep 15 10:22:20 2007 New Revision: 575943 URL: http://svn.apache.org/viewvc?rev=575943&view=rev Log: Merging the fix for the wedged build from the trunk
svn merge -c 575845 https://svn.apache.org/repos/asf/openejb/trunk/openejb3 Modified: openejb/branches/3.0-beta-1/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java Modified: openejb/branches/3.0-beta-1/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java URL: http://svn.apache.org/viewvc/openejb/branches/3.0-beta-1/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=575943&r1=575942&r2=575943&view=diff ============================================================================== --- openejb/branches/3.0-beta-1/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java (original) +++ openejb/branches/3.0-beta-1/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java Sat Sep 15 10:22:20 2007 @@ -64,6 +64,7 @@ import org.apache.openejb.util.LogCategory; import org.apache.openejb.util.Logger; import org.apache.openejb.util.Messages; +import org.apache.openejb.util.Join; import javax.xml.bind.JAXBException; import java.io.File; @@ -631,14 +632,14 @@ OpenEjbConfiguration runningConfig = getRunningConfig(); for (ResourceInfo resourceInfo : runningConfig.facilities.resources) { - if (resourceInfo.types.contains(type)) { + if (isResourceType(resourceInfo.service, resourceInfo.types, type)) { resourceIds.add(resourceInfo.id); } } if (sys != null) { for (ResourceInfo resourceInfo : sys.facilities.resources) { - if (resourceInfo.types.contains(type)) { + if (isResourceType(resourceInfo.service, resourceInfo.types, type)) { resourceIds.add(resourceInfo.id); } } @@ -647,13 +648,30 @@ // the above sys instance if (openejb != null) { for (Resource resource : openejb.getResource()) { - if (resource.getType() != null && resource.getType().equals(type)) { + ArrayList<String> types = new ArrayList<String>(); + if (resource.getType() != null){ + types.add(resource.getType()); + } + if (isResourceType("Resource", types, type)) { resourceIds.add(resource.getId()); } } } } return resourceIds; + } + + private boolean isResourceType(String service, List<String> types, String type) { + boolean b = false; + try { + if (type == null) return b = true; + if (service == null) return b = false; + return b = types.contains(type); + } finally { +// System.out.println("isResourceType: "+b+" ["+service +"] ["+type+"] ["+ Join.join(",", types)+"]"); +// Throwable throwable = new Exception().fillInStackTrace(); +// throwable.printStackTrace(System.out); + } } protected List<String> getContainerIds() {
