[jboss-svn-commits] JBL Code SVN: r35816 - in labs/jbosstm/trunk: ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts and 1 other directory.

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

Author: jhalliday
Date: 2010-11-01 10:03:56 -0400 (Mon, 01 Nov 2010)
New Revision: 35816

Modified:
   labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionSynchronizationRegistryImple.java
   labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionSynchronizationRegistryImple.java
Log:
Make TransactionSynchronizationRegistry impls also impl ObjectFactory. JBTM-814


Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionSynchronizationRegistryImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionSynchronizationRegistryImple.java	2010-11-01 13:05:53 UTC (rev 35815)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionSynchronizationRegistryImple.java	2010-11-01 14:03:56 UTC (rev 35816)
@@ -26,16 +26,20 @@
 import com.arjuna.ats.internal.jta.resources.arjunacore.SynchronizationImple;
 
 
-
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.spi.ObjectFactory;
 import javax.transaction.*;
 import java.io.Serializable;
- 
+import java.util.Hashtable;
+
 /**
  * Implementation of the TransactionSynchronizationRegistry interface, in line with the JTA 1.1 specification.
  *
  * @author jonathan.halliday at jboss.com
  */
-public class TransactionSynchronizationRegistryImple implements TransactionSynchronizationRegistry, Serializable {
+public class TransactionSynchronizationRegistryImple implements TransactionSynchronizationRegistry, Serializable, ObjectFactory
+{
     // This Imple is stateless and just delegates the work down to the transaction manager.
     // It's Serilizable so it can be shoved into the app server JNDI.
 
@@ -46,6 +50,11 @@
 
     private static final long serialVersionUID = 1L;
 
+	public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable environment) throws Exception
+	{
+		return this;
+	}
+
     // Return an opaque object to represent the transaction bound to the current thread at the time this method is called.
         public Object getTransactionKey()
         {

Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionSynchronizationRegistryImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionSynchronizationRegistryImple.java	2010-11-01 13:05:53 UTC (rev 35815)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionSynchronizationRegistryImple.java	2010-11-01 14:03:56 UTC (rev 35816)
@@ -26,16 +26,20 @@
 import com.arjuna.ats.internal.jta.resources.jts.orbspecific.JTAInterposedSynchronizationImple;
 
 
-
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.spi.ObjectFactory;
 import javax.transaction.*;
 import java.io.Serializable;
+import java.util.Hashtable;
 
 /**
  * Implementation of the TransactionSynchronizationRegistry interface, in line with the JTA 1.1 specification.
  *
  * @author jonathan.halliday at jboss.com
  */
-public class TransactionSynchronizationRegistryImple implements TransactionSynchronizationRegistry, Serializable {
+public class TransactionSynchronizationRegistryImple implements TransactionSynchronizationRegistry, Serializable, ObjectFactory
+{
 
     // This Imple is stateless and just delegates the work down to the transaction manager.
     // It's Serilizable so it can be shoved into the app server JNDI.
@@ -49,6 +53,11 @@
 
     private static final long serialVersionUID = 1L;
 
+    public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable environment) throws Exception
+    {
+        return this;
+    }
+
         public Object getTransactionKey()
         {
                 if (jtaxLogger.logger.isTraceEnabled()) {