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

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

Author: jesper.pedersen
Date: 2010-06-07 10:56:44 -0400 (Mon, 07 Jun 2010)
New Revision: 105760

Modified:
   trunk/connector/src/main/java/org/jboss/resource/connectionmanager/TxConnectionManager.java
Log:
[JBAS-8072] Set WrapXAResource to true by default

Modified: trunk/connector/src/main/java/org/jboss/resource/connectionmanager/TxConnectionManager.java
===================================================================
--- trunk/connector/src/main/java/org/jboss/resource/connectionmanager/TxConnectionManager.java	2010-06-07 13:44:30 UTC (rev 105759)
+++ trunk/connector/src/main/java/org/jboss/resource/connectionmanager/TxConnectionManager.java	2010-06-07 14:56:44 UTC (rev 105760)
@@ -146,7 +146,7 @@
    
    private boolean padXid;
    
-   private boolean wrapXAResource;
+   private boolean wrapXAResource = true;
 
    private Boolean isSameRMOverrideValue;
 
@@ -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)
             {