From a6e781e3dc010072f0e6510d7a87157ce8bea04c Mon Sep 17 00:00:00 2001
From: Erik Brakkee <erik@brakkee.org>
Date: Sat, 17 Jul 2010 21:08:54 +0000
Subject: [PATCH]

---
 .../SimpleTransactionManager.java             | 31 +++++++++++++------
 .../SimpleTransactionManagerTest.java         | 10 +++---
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/test/enterprise/src/main/java/org/wamblee/test/transactions/SimpleTransactionManager.java b/test/enterprise/src/main/java/org/wamblee/test/transactions/SimpleTransactionManager.java
index ee8eb77d..c81eb979 100644
--- a/test/enterprise/src/main/java/org/wamblee/test/transactions/SimpleTransactionManager.java
+++ b/test/enterprise/src/main/java/org/wamblee/test/transactions/SimpleTransactionManager.java
@@ -20,6 +20,8 @@ import java.util.List;
 
 import javax.transaction.UserTransaction;
 
+import org.wamblee.general.ThreadSpecificProxyFactory;
+
 /**
  * Simple transaction manager provides a simple mechanism to manage transaction
  * in test code through the {@link UserTransaction} object.
@@ -30,7 +32,7 @@ import javax.transaction.UserTransaction;
 public class SimpleTransactionManager {
 
     private UserTransactionFactory factory;
-    private ThreadLocal<UserTransaction> current;
+    private ThreadSpecificProxyFactory<UserTransaction> transaction; 
     private UserTransactionCallback callback;
     private List<TransactionResource> resources;
 
@@ -42,12 +44,12 @@ public class SimpleTransactionManager {
      */
     public SimpleTransactionManager(UserTransactionFactory aFactory) {
         factory = aFactory;
-        current = new ThreadLocal<UserTransaction>();
+        transaction = new ThreadSpecificProxyFactory<UserTransaction>(UserTransaction.class);
         callback = new UserTransactionCallback() {
 
             @Override
             public void transactionFinished() {
-                current.set(null);
+                transaction.set(null);
             }
         };
         resources = new ArrayList<TransactionResource>();
@@ -65,16 +67,27 @@ public class SimpleTransactionManager {
     }
 
     /**
-     * Gets a transaction associated with the current thread.
+     * Gets the user transaction. This is a contextual reference, meaning that
+     * it will delegate to the appropriate thread-specific user transaction. 
+     * It is also safe to store in a JNDI tree and for caching by applications. 
      * 
      * @return User transaction.
      */
     public UserTransaction getTransaction() {
-        UserTransaction transaction = current.get();
-        if (transaction == null) {
-            transaction = factory.create(callback, resources);
-            current.set(transaction);
+        UserTransaction tx = transaction.get();
+        if (tx == null) {
+            tx = factory.create(callback, resources);
+            transaction.set(tx);
         }
-        return transaction;
+        return transaction.getProxy();
+    }
+    
+    /**
+     * Gets the thread-specific transaction object. 
+     * @return Transaction object. 
+     */
+    UserTransaction getThreadSpecificTransaction() { 
+       getTransaction(); // create tx if needed
+       return transaction.get();
     }
 }
diff --git a/test/enterprise/src/test/java/org/wamblee/test/transactions/SimpleTransactionManagerTest.java b/test/enterprise/src/test/java/org/wamblee/test/transactions/SimpleTransactionManagerTest.java
index 97c0359d..d0630ad8 100644
--- a/test/enterprise/src/test/java/org/wamblee/test/transactions/SimpleTransactionManagerTest.java
+++ b/test/enterprise/src/test/java/org/wamblee/test/transactions/SimpleTransactionManagerTest.java
@@ -63,14 +63,14 @@ public class SimpleTransactionManagerTest {
 
     @Test
     public void testTransactionsAreThreadSpecific() throws Exception {
-        UserTransaction transaction = manager.getTransaction();
+        UserTransaction transaction = manager.getThreadSpecificTransaction();
         assertNotNull(transaction);
-        assertSame(transaction, manager.getTransaction());
+        assertSame(transaction, manager.getThreadSpecificTransaction());
         final ValueHolder<UserTransaction> transaction2 = new ValueHolder<UserTransaction>();
         Thread t = new Thread(new Runnable() {
             @Override
             public void run() {
-                transaction2.setValue(manager.getTransaction());
+                transaction2.setValue(manager.getThreadSpecificTransaction());
             }
         });
         t.start();
@@ -82,11 +82,11 @@ public class SimpleTransactionManagerTest {
 
     @Test
     public void testTransactionLifeCycle() {
-        UserTransaction transaction = manager.getTransaction();
+        UserTransaction transaction = manager.getThreadSpecificTransaction();
         assertNotNull(transaction);
         assertEquals(1, callbacks.size());
         callbacks.get(0).transactionFinished();
-        UserTransaction transaction2 = manager.getTransaction();
+        UserTransaction transaction2 = manager.getThreadSpecificTransaction();
         assertNotNull(transaction2);
         assert (transaction != transaction2);
     }
-- 
2.31.1