[jboss-cvs] JBossAS SVN: r84035 - branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf.

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

Author: scott.stark at jboss.org
Date: 2009-02-10 02:59:39 -0500 (Tue, 10 Feb 2009)
New Revision: 84035

Modified:
   branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
Log:
JBAS-6188, handle the deprecated track-connection-by-tx illegal values

Modified: branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
===================================================================
--- branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java	2009-02-10 07:59:07 UTC (rev 84034)
+++ branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java	2009-02-10 07:59:39 UTC (rev 84035)
@@ -33,6 +33,7 @@
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
+import org.jboss.logging.Logger;
 import org.jboss.managed.api.annotation.ManagementObject;
 import org.jboss.managed.api.annotation.ManagementObjectID;
 import org.jboss.managed.api.annotation.ManagementObjectRef;
@@ -55,6 +56,8 @@
 public class ManagedConnectionFactoryDeploymentMetaData
    implements Serializable, ConnectionPoolMetaData
 {
+   private static Logger log = Logger.getLogger(ManagedConnectionFactoryDeploymentMetaData.class);
+
    /** The serialVersionUID */
    private static final long serialVersionUID = -4591557831734316580L;
 
@@ -528,7 +531,10 @@
    public void setTrackConnectionByTransaction(Boolean trackConnectionByTransaction)
    {
       if(Boolean.TRUE == getLocalTransactions() && !Boolean.TRUE.equals(trackConnectionByTransaction))
-         throw new IllegalStateException("In case of local transactions track-connection-by-tx must always be true");      
+      {
+         log.warn("In case of local transactions track-connection-by-tx must always be true");
+         trackConnectionByTransaction = Boolean.TRUE;
+      }
       setInterleaving(!Boolean.TRUE.equals(trackConnectionByTransaction));
    }