You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/03/20 08:40:53 UTC

svn commit: r639185 - /geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/src/main/java/org/apache/geronimo/openejb/deployment/cluster/WADIOpenEJBClusteringBuilder.java

Author: djencks
Date: Thu Mar 20 00:40:52 2008
New Revision: 639185

URL: http://svn.apache.org/viewvc?rev=639185&view=rev
Log:
avoid a likely NPE

Modified:
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/src/main/java/org/apache/geronimo/openejb/deployment/cluster/WADIOpenEJBClusteringBuilder.java

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/src/main/java/org/apache/geronimo/openejb/deployment/cluster/WADIOpenEJBClusteringBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/src/main/java/org/apache/geronimo/openejb/deployment/cluster/WADIOpenEJBClusteringBuilder.java?rev=639185&r1=639184&r2=639185&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/src/main/java/org/apache/geronimo/openejb/deployment/cluster/WADIOpenEJBClusteringBuilder.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/src/main/java/org/apache/geronimo/openejb/deployment/cluster/WADIOpenEJBClusteringBuilder.java Thu Mar 20 00:40:52 2008
@@ -157,20 +157,22 @@
         
         OpenejbGeronimoEjbJarType geronimoEjbJarType = ejbModule.getVendorDD();
         GerOpenejbClusteringWadiType clusteringWadiType = getWadiClusterConfig(geronimoEjbJarType);
-        AbstractName sessionManagerName = addSessionManager(clusteringWadiType, ejbModule, earContext);
+        if (clusteringWadiType != null) {
+            AbstractName sessionManagerName = addSessionManager(clusteringWadiType, ejbModule, earContext);
 
-        addNetworkConnectorMonitor(earContext, sessionManagerName);
+            addNetworkConnectorMonitor(earContext, sessionManagerName);
 
-        EjbJar ejbJar = ejbModule.getEjbJar();
-        for (EnterpriseBean enterpriseBean : ejbJar.getEnterpriseBeans()) {
-            if (enterpriseBean instanceof SessionBean) {
-                SessionBean sessionBean = (SessionBean) enterpriseBean;
-                switch (sessionBean.getSessionType()) {
-                    case STATEFUL:
-                        replaceByClusteredDeploymentGBean(earContext,
-                            ejbModule,
-                            sessionManagerName,
-                            enterpriseBean);
+            EjbJar ejbJar = ejbModule.getEjbJar();
+            for (EnterpriseBean enterpriseBean : ejbJar.getEnterpriseBeans()) {
+                if (enterpriseBean instanceof SessionBean) {
+                    SessionBean sessionBean = (SessionBean) enterpriseBean;
+                    switch (sessionBean.getSessionType()) {
+                        case STATEFUL:
+                            replaceByClusteredDeploymentGBean(earContext,
+                                ejbModule,
+                                sessionManagerName,
+                                enterpriseBean);
+                    }
                 }
             }
         }