[jboss-cvs] JBossAS SVN: r68981 - trunk/server/src/main/org/jboss/ejb/deployers.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2008-01-15 09:44:51 -0500 (Tue, 15 Jan 2008)
New Revision: 68981

Modified:
   trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java
Log:
handle NPE

Modified: trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java	2008-01-15 10:55:34 UTC (rev 68980)
+++ trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java	2008-01-15 14:44:51 UTC (rev 68981)
@@ -116,8 +116,11 @@
                jadmd.setSecurityRoles(earSecurityRolesMetaData);
             
             //perform a merge to rebuild the principalVersusRolesMap
-            mergedSecurityRolesMetaData.merge(mergedSecurityRolesMetaData, 
-                  earSecurityRolesMetaData);
+            if(mergedSecurityRolesMetaData != null )
+            {
+                mergedSecurityRolesMetaData.merge(mergedSecurityRolesMetaData, 
+                     earSecurityRolesMetaData);
+            }
         }
       }
 
@@ -125,4 +128,4 @@
       unit.getTransientManagedObjects().addAttachment(JBossMetaData.class, mergedMetaData);
    }
 
-}
\ No newline at end of file
+}