[jboss-cvs] JBossAS SVN: r68913 - trunk/server/src/main/org/jboss/deployment.

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

Author: scott.stark at jboss.org
Date: 2008-01-12 04:02:07 -0500 (Sat, 12 Jan 2008)
New Revision: 68913

Modified:
   trunk/server/src/main/org/jboss/deployment/ReferenceMetaDataResolverDeployer.java
Log:
Validate the message destinations for null

Modified: trunk/server/src/main/org/jboss/deployment/ReferenceMetaDataResolverDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/ReferenceMetaDataResolverDeployer.java	2008-01-12 08:32:59 UTC (rev 68912)
+++ trunk/server/src/main/org/jboss/deployment/ReferenceMetaDataResolverDeployer.java	2008-01-12 09:02:07 UTC (rev 68913)
@@ -562,20 +562,26 @@
       {
          JBossMetaData appMD = unit.getAttachment(JBossMetaData.class);
          mds = appMD.getAssemblyDescriptor().getMessageDestinations();
-         searched.addAll(mds);
-         md = mds.get(link);
-         if (md != null)
-            return md;
+         if(mds != null)
+         {
+            searched.addAll(mds);
+            md = mds.get(link);
+            if (md != null)
+               return md;
+         }
       }
 
       if (unit.getAttachment(JBossWebMetaData.class) != null)
       {
          JBossWebMetaData webMD = unit.getAttachment(JBossWebMetaData.class);
          mds = webMD.getMessageDestinations();
-         searched.addAll(mds);
-         md = mds.get(link);
-         if(md != null)
-            return md;
+         if(mds != null)
+         {
+            searched.addAll(mds);
+            md = mds.get(link);
+            if (md != null)
+               return md;
+         }
       }
 
       // Search each subcontext