svn commit: r479768 - /incubator/openejb/branches/v2_2/openejb2/modules/openejb-corba-builder/src/main/java/org/apache/openejb/deployment/TSSLinkBuilder.java

[ri...@apache.org]

Author: rickmcguire
Date: Mon Nov 27 13:23:03 2006
New Revision: 479768

URL: http://svn.apache.org/viewvc?view=rev&rev=479768
Log:
Merge David Jencks's trunk fix to keep TSSLinkBuilder from getting a NullPointerException when called 
with a null plan. 


Modified:
    incubator/openejb/branches/v2_2/openejb2/modules/openejb-corba-builder/src/main/java/org/apache/openejb/deployment/TSSLinkBuilder.java

Modified: incubator/openejb/branches/v2_2/openejb2/modules/openejb-corba-builder/src/main/java/org/apache/openejb/deployment/TSSLinkBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/branches/v2_2/openejb2/modules/openejb-corba-builder/src/main/java/org/apache/openejb/deployment/TSSLinkBuilder.java?view=diff&rev=479768&r1=479767&r2=479768
==============================================================================
--- incubator/openejb/branches/v2_2/openejb2/modules/openejb-corba-builder/src/main/java/org/apache/openejb/deployment/TSSLinkBuilder.java (original)
+++ incubator/openejb/branches/v2_2/openejb2/modules/openejb-corba-builder/src/main/java/org/apache/openejb/deployment/TSSLinkBuilder.java Mon Nov 27 13:23:03 2006
@@ -69,11 +69,15 @@
     }
 
     static boolean hasTssLinks(XmlObject plan) {
-        return plan.selectChildren(TSS_LINK_QNAME).length > 0 ||
-                plan.selectChildren(TSS_QNAME).length > 0;
+        return plan != null && (plan.selectChildren(TSS_LINK_QNAME).length > 0 ||
+                plan.selectChildren(TSS_QNAME).length > 0);
     }
 
     public void buildNaming(XmlObject specDD, XmlObject plan, Configuration localConfiguration, Configuration remoteConfiguration, Module module, Map componentContext) throws DeploymentException {
+        if (plan == null) {
+            return;
+        }
+
         AbstractName ejbName = getGBeanName(componentContext);
 
         String[] tssLinks = toStringArray(plan.selectChildren(TSS_LINK_QNAME));