svn commit: r1166504 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java

[genspring]

Author: genspring
Date: Thu Sep  8 02:40:17 2011
New Revision: 1166504

URL: http://svn.apache.org/viewvc?rev=1166504&view=rev
Log:
Fix NPE when building geornimo mejb plugin.

Modified:
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java?rev=1166504&r1=1166503&r2=1166504&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
 Thu Sep  8 02:40:17 2011
@@ -451,6 +451,9 @@ public class JndiEncBuilder {
         }
 
         OpenEjbConfiguration config = 
SystemInstance.get().getComponent(OpenEjbConfiguration.class);
+        
+        if(config !=null){
+            
         for (ResourceInfo resource : config.facilities.resources) {
             String jndiName = resource.jndiName;
             if (jndiName != null && !jndiName.isEmpty()) {
@@ -460,7 +463,8 @@ public class JndiEncBuilder {
                 bindings.put(boundName, reference);
             }
         }
-
+        
+       }
         return bindings;
     }