[jboss-cvs] JBossAS SVN: r105761 - branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/connectionmanager.

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

Author: jesper.pedersen
Date: 2010-06-07 10:59:20 -0400 (Mon, 07 Jun 2010)
New Revision: 105761

Modified:
   branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java
Log:
Guard against null metadata when WrapXAResource is true

Modified: branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java
===================================================================
--- branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java	2010-06-07 14:56:44 UTC (rev 105760)
+++ branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java	2010-06-07 14:59:20 UTC (rev 105761)
@@ -494,8 +494,11 @@
 
             try
             {
-               eisProductName = mc.getMetaData().getEISProductName();
-               eisProductVersion = mc.getMetaData().getEISProductVersion();
+               if (mc.getMetaData() != null)
+               {
+                  eisProductName = mc.getMetaData().getEISProductName();
+                  eisProductVersion = mc.getMetaData().getEISProductVersion();
+               }
             }
             catch (ResourceException re)
             {