[jboss-cvs] JBossAS SVN: r110074 - 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-21 08:33:14 -0500 (Tue, 21 Dec 2010)
New Revision: 110074

Modified:
   trunk/connector/src/main/java/org/jboss/resource/deployers/EARDataSourceDeployer.java
Log:
[JBAS-8559] Fixed issue with null EnvironmentRefs group reported by client.

Modified: trunk/connector/src/main/java/org/jboss/resource/deployers/EARDataSourceDeployer.java
===================================================================
--- trunk/connector/src/main/java/org/jboss/resource/deployers/EARDataSourceDeployer.java	2010-12-21 12:43:05 UTC (rev 110073)
+++ trunk/connector/src/main/java/org/jboss/resource/deployers/EARDataSourceDeployer.java	2010-12-21 13:33:14 UTC (rev 110074)
@@ -23,7 +23,7 @@
 	{
 		EarMetaData emd = unit.getAttachment(EarMetaData.class);
 		
-		if(emd != null && emd.isEE6())
+		if(emd != null && emd.isEE6() && ((Ear60MetaData)emd).getEarEnvironmentRefsGroup() != null )
 		{
 			return ((Ear60MetaData)emd).getEarEnvironmentRefsGroup().getDataSources();
 		}