[jboss-cvs] JBossAS SVN: r109776 - trunk/connector/src/main/java/org/jboss/resource/deployers.

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

Author: weston.price at jboss.com
Date: 2010-12-08 08:03:35 -0500 (Wed, 08 Dec 2010)
New Revision: 109776

Modified:
   trunk/connector/src/main/java/org/jboss/resource/deployers/DataSourceDeployer.java
Log:
[JBAS-8559] Fixed NPE with environment refs group being null.

Modified: trunk/connector/src/main/java/org/jboss/resource/deployers/DataSourceDeployer.java
===================================================================
--- trunk/connector/src/main/java/org/jboss/resource/deployers/DataSourceDeployer.java	2010-12-08 12:55:19 UTC (rev 109775)
+++ trunk/connector/src/main/java/org/jboss/resource/deployers/DataSourceDeployer.java	2010-12-08 13:03:35 UTC (rev 109776)
@@ -170,11 +170,14 @@
 		
 		if(isWARSupported() && wmd != null && wmd.is30())
 		{
-			temp = wmd.getJndiEnvironmentRefsGroup().getDataSources();
-			
-			if(temp != null && !temp.isEmpty())
+			if(wmd.getJndiEnvironmentRefsGroup() != null)
 			{
-				candidates.addAll(temp);
+				temp = wmd.getJndiEnvironmentRefsGroup().getDataSources();
+				
+				if(temp != null && !temp.isEmpty())
+				{
+					candidates.addAll(temp);
+				}				
 			}
 		}
 		
@@ -198,14 +201,18 @@
 
 		if(isEJBSupported() && (ebmd != null && ebmd.isEJB31()))
 		{
-			for(JBossEnterpriseBeanMetaData md: ebmd.getEnterpriseBeans())
+			if(ebmd.getEnterpriseBeans() != null)
 			{
-				temp = md.getDataSources();
-				
-				if(temp != null && !temp.isEmpty())
+				for(JBossEnterpriseBeanMetaData md: ebmd.getEnterpriseBeans())
 				{
-					candidates.addAll(temp);
+					temp = md.getDataSources();
+					
+					if(temp != null && !temp.isEmpty())
+					{
+						candidates.addAll(temp);
+					}
 				}
+				
 			}
 		
 		}