[jboss-cvs] JBossAS SVN: r85229 - trunk/connector/src/main/org/jboss/resource/metadata/mcf.

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

Author: emuckenhuber
Date: 2009-03-04 10:18:24 -0500 (Wed, 04 Mar 2009)
New Revision: 85229

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

Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java	2009-03-04 15:04:47 UTC (rev 85228)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java	2009-03-04 15:18:24 UTC (rev 85229)
@@ -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;
@@ -40,8 +41,8 @@
 import org.jboss.managed.api.annotation.ManagementProperty;
 import org.jboss.managed.api.annotation.ManagementPropertyFactory;
 import org.jboss.managed.api.annotation.ViewUse;
+import org.jboss.resource.deployers.management.ConnectionFactoryProperty;
 import org.jboss.system.metadata.ServiceMetaData;
-import org.jboss.resource.deployers.management.ConnectionFactoryProperty;
 
 
 /**
@@ -57,6 +58,9 @@
 {
    /** The serialVersionUID */
    private static final long serialVersionUID = -4591557831734316580L;
+   
+   /** The logger. */
+   private static Logger log = Logger.getLogger(ManagedConnectionFactoryDeploymentMetaData.class);
 
    /** The jndiName */   
    @XmlElement(name="jndi-name")
@@ -528,7 +532,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));
    }