svn commit: r579080 - /openejb/branches/3.0-beta-1/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java

[djencks]

Author: djencks
Date: Mon Sep 24 22:48:08 2007
New Revision: 579080

URL: http://svn.apache.org/viewvc?rev=579080&view=rev
Log:
GERONIMO-3484 fix NPEs when there is no running OpenEjbConfiguration and add 
constructor so you can supply one for sys.  Merge from trunk

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=579080&r1=579079&r2=579080&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
 Mon Sep 24 22:48:08 2007
@@ -101,6 +101,11 @@
         this(false);
     }
 
+    public ConfigurationFactory(boolean offline, OpenEjbConfiguration 
configuration) {
+        this(offline);
+        sys = configuration;
+    }
+
     public static class Chain implements DynamicDeployer{
         private final List<DynamicDeployer> chain = new 
ArrayList<DynamicDeployer>();
 
@@ -671,9 +676,11 @@
         List<String> resourceIds = new ArrayList<String>();
 
         OpenEjbConfiguration runningConfig = getRunningConfig();
-        for (ResourceInfo resourceInfo : runningConfig.facilities.resources) {
-            if (isResourceType(resourceInfo.service, resourceInfo.types, 
type)) {
-                resourceIds.add(resourceInfo.id);
+        if (runningConfig != null) {
+            for (ResourceInfo resourceInfo : 
runningConfig.facilities.resources) {
+                if (isResourceType(resourceInfo.service, resourceInfo.types, 
type)) {
+                    resourceIds.add(resourceInfo.id);
+                }
             }
         }
 
@@ -745,8 +752,10 @@
         List<ContainerInfo> containers = new ArrayList<ContainerInfo>();
 
         OpenEjbConfiguration runningConfig = getRunningConfig();
-        for (ContainerInfo containerInfo : 
runningConfig.containerSystem.containers) {
-            containers.add(containerInfo);
+        if (runningConfig != null) {
+            for (ContainerInfo containerInfo : 
runningConfig.containerSystem.containers) {
+                containers.add(containerInfo);
+            }
         }
 
         if (sys != null) {