[jboss-cvs] JBossAS SVN: r105765 - projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/tx.

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

Author: jesper.pedersen
Date: 2010-06-07 11:31:33 -0400 (Mon, 07 Jun 2010)
New Revision: 105765

Modified:
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManager.java
Log:
Guard against null metadata

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManager.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManager.java	2010-06-07 15:25:17 UTC (rev 105764)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManager.java	2010-06-07 15:31:33 UTC (rev 105765)
@@ -146,7 +146,7 @@
    private boolean padXid;
    
    /**XA resource wrapped or not*/
-   private boolean wrapXAResource;
+   private boolean wrapXAResource = true;
 
    /**Same RM override*/
    private Boolean isSameRMOverrideValue;
@@ -471,8 +471,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)
             {