[jboss-cvs] JBossAS SVN: r76314 - in branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter: jms and 1 other directory.

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

Author: adrian at jboss.org
Date: 2008-07-28 13:03:35 -0400 (Mon, 28 Jul 2008)
New Revision: 76314

Modified:
   branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnection.java
   branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/JmsXAResource.java
Log:
[JBAS-5801] - No need to lock during 2PC protocol, which interferes with interleaving. Locking durning end() is enough

Modified: branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnection.java
===================================================================
--- branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnection.java	2008-07-28 17:02:26 UTC (rev 76313)
+++ branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnection.java	2008-07-28 17:03:35 UTC (rev 76314)
@@ -183,41 +183,17 @@
 
    public int prepare(Xid xid) throws XAException
    {
-      lock();
-      try
-      {
-         return xaResource.prepare(xid);
-      }
-      finally
-      {
-         unlock();
-      }
+      return xaResource.prepare(xid);
    }
 
    public void commit(Xid xid, boolean onePhase) throws XAException
    {
-      lock();
-      try
-      {
-         xaResource.commit(xid, onePhase);
-      }
-      finally
-      {
-         unlock();
-      }
+      xaResource.commit(xid, onePhase);
    }
 
    public void rollback(Xid xid) throws XAException
    {
-      lock();
-      try
-      {
-         xaResource.rollback(xid);
-      }
-      finally
-      {
-         unlock();
-      }
+      xaResource.rollback(xid);
    }
 
    public void forget(Xid xid) throws XAException

Modified: branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/JmsXAResource.java
===================================================================
--- branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/JmsXAResource.java	2008-07-28 17:02:26 UTC (rev 76313)
+++ branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/JmsXAResource.java	2008-07-28 17:03:35 UTC (rev 76314)
@@ -79,41 +79,17 @@
 
    public int prepare(Xid xid) throws XAException
    {
-      managedConnection.lock();
-      try
-      {
-         return xaResource.prepare(xid);
-      }
-      finally
-      {
-         managedConnection.unlock();
-      }
+      return xaResource.prepare(xid);
    }
 
    public void commit(Xid xid, boolean onePhase) throws XAException
    {
-      managedConnection.lock();
-      try
-      {
-         xaResource.commit(xid, onePhase);
-      }
-      finally
-      {
-         managedConnection.unlock();
-      }
+      xaResource.commit(xid, onePhase);
    }
 
    public void rollback(Xid xid) throws XAException
    {
-      managedConnection.lock();
-      try
-      {
-         xaResource.rollback(xid);
-      }
-      finally
-      {
-         managedConnection.unlock();
-      }
+      xaResource.rollback(xid);
    }
 
    public void forget(Xid xid) throws XAException