You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by ke...@apache.org on 2007/10/07 21:18:26 UTC

svn commit: r582667 - /geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java

Author: kevan
Date: Sun Oct  7 12:18:25 2007
New Revision: 582667

URL: http://svn.apache.org/viewvc?rev=582667&view=rev
Log:
GERONIMO-3514 Merge from branches/2.0. Avoid NPE when RA GBean does not hava a messageListenerToActivationSpecMap

Modified:
    geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java

Modified: geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=582667&r1=582666&r2=582667&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java Sun Oct  7 12:18:25 2007
@@ -631,6 +631,9 @@
         for (GBeanData resourceAdapterWrapperData : resourceAdapterWrappers) {
             String resourceAdapterId = getResourceAdapterId(resourceAdapterWrapperData.getAbstractName());
             Map<String, String> messageListenerToActivationSpecMap = (Map<String, String>) resourceAdapterWrapperData.getAttribute("messageListenerToActivationSpecMap");
+            if (messageListenerToActivationSpecMap == null) {
+                continue;
+            }
             for (Map.Entry<String, String> entry : messageListenerToActivationSpecMap.entrySet()) {
                 String messageListenerInterface = entry.getKey();
                 String activationSpecClass = entry.getValue();