[jboss-cvs] JBossAS SVN: r77529 - in trunk/connector/src/main/org/jboss/resource: metadata/mcf and 1 other directory.

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

Author: alex.loubyansky at jboss.com
Date: 2008-08-27 07:53:07 -0400 (Wed, 27 Aug 2008)
New Revision: 77529

Modified:
   trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java
   trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
Log:
JBAS-5891

Modified: trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java	2008-08-27 11:51:57 UTC (rev 77528)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java	2008-08-27 11:53:07 UTC (rev 77529)
@@ -225,7 +225,7 @@
       addManagedProperty("no-tx-separate-pools", "", true, SimpleMetaType.BOOLEAN, mo);
       addManagedProperty("statistics-formatter", "", true, SimpleMetaType.STRING, mo);
       addManagedProperty("isSameRM-override-value", "", true, SimpleMetaType.BOOLEAN, mo);
-      addManagedProperty("track-connection-by-tx", "", false, SimpleMetaType.BOOLEAN, mo);
+      addManagedProperty("track-connection-by-tx", "", false, SimpleMetaType.BOOLEAN, Boolean.TRUE, mo);
       addManagedProperty("interleaving", "", false, SimpleMetaType.BOOLEAN, mo);
       MetaType type = new MapCompositeMetaType(SimpleMetaType.STRING);
       addManagedProperty("config-property", "The connection factory config properties", false, type, mo);

Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java	2008-08-27 11:51:57 UTC (rev 77528)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java	2008-08-27 11:53:07 UTC (rev 77529)
@@ -526,19 +526,15 @@
    @Deprecated
    public void setTrackConnectionByTransaction(Boolean trackConnectionByTransaction)
    {
-      // TODO - is this proper fix?
-      if (trackConnectionByTransaction == null || getLocalTransactions() == null)
-         return;
-
-      if(getLocalTransactions() && !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");      
-      setInterleaving(!trackConnectionByTransaction);
+      setInterleaving(!Boolean.TRUE.equals(trackConnectionByTransaction));
    }
 
    @ManagementProperty(name="interleaving", includeInTemplate=true)
    public Boolean isInterleaving()
    {
-      return !getLocalTransactions() && interleaving;
+      return interleaving == Boolean.TRUE && !Boolean.TRUE.equals(getLocalTransactions());
    }
 
    public void setInterleaving(Boolean interleaving)