[jboss-svn-commits] JBL Code SVN: r9304 - in labs/jbosstm/trunk: ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/thread and 14 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Feb 2 12:46:23 EST 2007
Author: kevin.conner at jboss.com
Date: 2007-02-02 12:46:23 -0500 (Fri, 02 Feb 2007)
New Revision: 9304
Added:
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/ThreadUtil.java
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/thread/TransactionalThread.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/thread/ThreadActionData.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/BaseTransaction.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextManager.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/coordinator/CheckedActions.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/interceptors/context/ContextClientRequestInterceptorImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextClientRequestInterceptorImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextClientRequestInterceptorImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/interceptors/context/ContextClientRequestInterceptorImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/PropagationContextManager.java
Log:
Updated thread association
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java 2007-02-02 16:49:24 UTC (rev 9303)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java 2007-02-02 17:46:23 UTC (rev 9304)
@@ -39,6 +39,7 @@
import com.arjuna.ats.arjuna.common.*;
import com.arjuna.ats.arjuna.state.*;
import com.arjuna.ats.arjuna.objectstore.ObjectStore;
+import com.arjuna.ats.arjuna.utils.ThreadUtil;
import com.arjuna.ats.arjuna.utils.Utility;
import com.arjuna.ats.internal.arjuna.thread.*;
import java.util.*;
@@ -849,8 +850,7 @@
if (_childThreads == null)
_childThreads = new Hashtable();
- final String threadId = Integer.toHexString(System.identityHashCode(t)) ;
- _childThreads.put(threadId, t); // makes sure so we don't get
+ _childThreads.put(ThreadUtil.getThreadId(t), t); // makes sure so we don't get
// duplicates
result = true;
@@ -881,8 +881,7 @@
public final boolean removeChildThread () // current thread
{
- final String threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
- return removeChildThread(threadId);
+ return removeChildThread(ThreadUtil.getThreadId());
}
/**
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/thread/TransactionalThread.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/thread/TransactionalThread.java 2007-02-02 16:49:24 UTC (rev 9303)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/thread/TransactionalThread.java 2007-02-02 17:46:23 UTC (rev 9304)
@@ -32,6 +32,8 @@
package com.arjuna.ats.arjuna.thread;
import com.arjuna.ats.arjuna.coordinator.*;
+import com.arjuna.ats.arjuna.utils.ThreadUtil;
+
import java.util.Hashtable;
import java.lang.Thread;
@@ -56,8 +58,7 @@
{
if (action != null)
{
- final String threadId = Integer.toHexString(System.identityHashCode(this)) ;
- action.removeChildThread(threadId);
+ action.removeChildThread(ThreadUtil.getThreadId(this));
action = null;
}
}
@@ -69,7 +70,7 @@
* should work!
*/
- final String threadId = Integer.toHexString(System.identityHashCode(thread)) ;
+ final String threadId = ThreadUtil.getThreadId(thread) ;
if (actions.get(threadId) == null)
{
BasicAction currentAction = BasicAction.Current();
@@ -88,7 +89,7 @@
public static void destroy (Thread thread) throws IllegalArgumentException
{
- final String threadId = Integer.toHexString(System.identityHashCode(thread)) ;
+ final String threadId = ThreadUtil.getThreadId(thread) ;
BasicAction currentAction = (BasicAction) actions.remove(threadId);
if (currentAction != null)
Added: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/ThreadUtil.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/ThreadUtil.java (rev 0)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/ThreadUtil.java 2007-02-02 17:46:23 UTC (rev 9304)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.arjuna.ats.arjuna.utils;
+
+/**
+ * Provides utilities to manage thread ids.
+ */
+public class ThreadUtil
+{
+ /**
+ * The ID associated with the thread.
+ */
+ private static final ThreadLocal THREAD_ID = new ThreadLocal() ;
+ /**
+ * The thread id counter.
+ */
+ private static long id ;
+
+ /**
+ * Get the string ID for the current thread.
+ * @return The thread id
+ */
+ public static String getThreadId()
+ {
+ return getThreadId(Thread.currentThread()) ;
+ }
+
+ /**
+ * Get the string ID for the specified thread.
+ * @param thread The thread.
+ * @return The thread id
+ */
+ public static String getThreadId(final Thread thread)
+ {
+ final Object id = THREAD_ID.get() ;
+ if (id != null)
+ {
+ return (String)id ;
+ }
+
+ final String newId = getNextId() ;
+ THREAD_ID.set(newId) ;
+ return newId ;
+ }
+
+ /**
+ * Get the next thread id to use.
+ * @return The next thread id.
+ */
+ private static synchronized String getNextId()
+ {
+ return "TSThread:" + Long.toHexString(++id) ;
+ }
+}
Property changes on: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/ThreadUtil.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/thread/ThreadActionData.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/thread/ThreadActionData.java 2007-02-02 16:49:24 UTC (rev 9303)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/thread/ThreadActionData.java 2007-02-02 17:46:23 UTC (rev 9304)
@@ -32,6 +32,8 @@
package com.arjuna.ats.internal.arjuna.thread;
import com.arjuna.ats.arjuna.coordinator.BasicAction;
+import com.arjuna.ats.arjuna.utils.ThreadUtil;
+
import java.lang.Thread;
import java.util.Stack;
import java.util.Vector;
@@ -145,15 +147,13 @@
public static BasicAction popAction () throws EmptyStackException
{
- final String threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
- return popAction(threadId, true);
+ return popAction(ThreadUtil.getThreadId(), true);
}
public static BasicAction popAction (boolean unregister)
throws EmptyStackException
{
- final String threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
- return popAction(threadId, unregister);
+ return popAction(ThreadUtil.getThreadId(), unregister);
}
public static BasicAction popAction (String threadId)
@@ -209,8 +209,7 @@
{
if ((act != null) && (unregister))
{
- final String threadId = Integer.toHexString(System.identityHashCode(t)) ;
- act.removeChildThread(threadId);
+ act.removeChildThread(ThreadUtil.getThreadId(t));
}
Stack txs = (Stack) _threadList.get();
@@ -252,8 +251,7 @@
if (act != null)
{
- final String threadId = Integer.toHexString(System.identityHashCode(t)) ;
- act.removeChildThread(threadId);
+ act.removeChildThread(ThreadUtil.getThreadId(t));
}
}
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/BaseTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/BaseTransaction.java 2007-02-02 16:49:24 UTC (rev 9303)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/BaseTransaction.java 2007-02-02 17:46:23 UTC (rev 9304)
@@ -31,6 +31,7 @@
package com.arjuna.ats.internal.jta.transaction.arjunacore;
+import com.arjuna.ats.arjuna.utils.ThreadUtil;
import com.arjuna.ats.jta.common.*;
import com.arjuna.ats.jta.logging.*;
@@ -83,8 +84,8 @@
}
}
- final String threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
- Integer value = (Integer) _timeouts.get(threadId);
+
+ Integer value = (Integer) _timeouts.get(ThreadUtil.getThreadId());
int v = 0; // if not set then assume 0. What else can we do?
if (value != null)
@@ -215,15 +216,13 @@
{
if (seconds >= 0)
{
- final String threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
- _timeouts.put(threadId, new Integer(seconds));
+ _timeouts.put(ThreadUtil.getThreadId(), new Integer(seconds));
}
}
public int getTimeout() throws javax.transaction.SystemException
{
- final String threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
- Integer value = (Integer) _timeouts.get(threadId);
+ Integer value = (Integer) _timeouts.get(ThreadUtil.getThreadId());
if (value != null)
{
@@ -266,8 +265,7 @@
throw new javax.transaction.SystemException(e2.toString());
}
- final String threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
- Integer value = (Integer) _timeouts.get(threadId);
+ Integer value = (Integer) _timeouts.get(ThreadUtil.getThreadId());
int v = 0; // if not set then assume 0. What else can we do?
if (value != null)
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextManager.java 2007-02-02 16:49:24 UTC (rev 9303)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextManager.java 2007-02-02 17:46:23 UTC (rev 9304)
@@ -65,6 +65,7 @@
import org.omg.PortableInterceptor.*;
import com.arjuna.ats.arjuna.exceptions.FatalError;
+import com.arjuna.ats.arjuna.utils.ThreadUtil;
import org.omg.CosTransactions.SubtransactionsUnavailable;
import org.omg.CosTransactions.NoTransaction;
@@ -179,8 +180,7 @@
com.arjuna.ats.jts.logging.FacilityCode.FAC_OTS, "ContextManager::current ()");
}
- final String threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
- Object arg = otsCurrent.get(threadId);
+ Object arg = otsCurrent.get(ThreadUtil.getThreadId());
ControlWrapper wrapper = null;
if (arg != null)
@@ -317,8 +317,7 @@
public final ControlWrapper popAction ()
{
- final String threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
- return popAction(threadId);
+ return popAction(ThreadUtil.getThreadId());
}
public final void purgeActions (String threadId)
@@ -349,8 +348,7 @@
public final void purgeActions ()
{
- final String threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
- purgeActions(threadId);
+ purgeActions(ThreadUtil.getThreadId());
}
/**
@@ -594,7 +592,7 @@
com.arjuna.ats.jts.logging.FacilityCode.FAC_OTS, "ContextManager::pushAction ()");
}
- final String threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
+ final String threadId = ThreadUtil.getThreadId() ;
Stack sl = (Stack) otsCurrent.get(threadId);
boolean isNew = false;
@@ -686,8 +684,7 @@
org.omg.CORBA.Any threadData = ORBManager.getORB().orb().create_any();
- final String threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
- threadData.insert_string(threadId);
+ threadData.insert_string(ThreadUtil.getThreadId());
_piCurrent.set_slot(slotId, threadData);
@@ -838,8 +835,7 @@
{
org.omg.CORBA.Any localDataAny = ORBManager.getORB().orb().create_any();
- final String threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
- localDataAny.insert_string(threadId);
+ localDataAny.insert_string(ThreadUtil.getThreadId());
_piCurrent.set_slot(slotId, localDataAny);
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/coordinator/CheckedActions.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/coordinator/CheckedActions.java 2007-02-02 16:49:24 UTC (rev 9303)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/coordinator/CheckedActions.java 2007-02-02 17:46:23 UTC (rev 9304)
@@ -32,6 +32,7 @@
package com.arjuna.ats.internal.jts.coordinator;
import com.arjuna.ats.arjuna.coordinator.CheckedAction;
+import com.arjuna.ats.arjuna.utils.ThreadUtil;
import java.util.Hashtable;
@@ -42,16 +43,14 @@
public static final synchronized void remove () throws SystemException
{
- final String threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
- otsCheckedAction.remove(threadId);
+ otsCheckedAction.remove(ThreadUtil.getThreadId());
}
public static final synchronized CheckedAction get () throws SystemException
{
if (otsCheckedAction != null)
{
- final String threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
- return (CheckedAction) otsCheckedAction.get(threadId);
+ return (CheckedAction) otsCheckedAction.get(ThreadUtil.getThreadId());
}
else
return null;
@@ -62,8 +61,7 @@
if (otsCheckedAction == null)
otsCheckedAction = new Hashtable();
- final String threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
- otsCheckedAction.put(threadId, ca);
+ otsCheckedAction.put(ThreadUtil.getThreadId(), ca);
}
private static Hashtable otsCheckedAction = null;
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/interceptors/context/ContextClientRequestInterceptorImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/interceptors/context/ContextClientRequestInterceptorImpl.java 2007-02-02 16:49:24 UTC (rev 9303)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/interceptors/context/ContextClientRequestInterceptorImpl.java 2007-02-02 17:46:23 UTC (rev 9304)
@@ -31,6 +31,7 @@
package com.arjuna.ats.jts.orbspecific.hporb.interceptors.context;
+import com.arjuna.ats.arjuna.utils.ThreadUtil;
import com.arjuna.ats.internal.jts.ControlWrapper;
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.OTSImpleManager;
@@ -186,7 +187,7 @@
throw new UNKNOWN(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.hporb.interceptors.context.invalidparam"));
}
else
- threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
+ threadId = ThreadUtil.getThreadId() ;
if (threadId != null)
{
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java 2007-02-02 16:49:24 UTC (rev 9303)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java 2007-02-02 17:46:23 UTC (rev 9304)
@@ -31,6 +31,7 @@
package com.arjuna.ats.jts.orbspecific.hporb.interceptors.interposition;
+import com.arjuna.ats.arjuna.utils.ThreadUtil;
import com.arjuna.ats.internal.jts.ControlWrapper;
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.OTSImpleManager;
@@ -182,7 +183,7 @@
throw new UNKNOWN("Invalid PI tx parameter!");
}
else
- threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
+ threadId = ThreadUtil.getThreadId() ;
if (threadId != null)
{
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextClientRequestInterceptorImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextClientRequestInterceptorImpl.java 2007-02-02 16:49:24 UTC (rev 9303)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextClientRequestInterceptorImpl.java 2007-02-02 17:46:23 UTC (rev 9304)
@@ -31,6 +31,7 @@
package com.arjuna.ats.jts.orbspecific.jacorb.interceptors.context;
+import com.arjuna.ats.arjuna.utils.ThreadUtil;
import com.arjuna.ats.internal.jts.ControlWrapper;
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.OTSImpleManager;
@@ -186,7 +187,7 @@
throw new UNKNOWN(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.invalidparam"));
}
else
- threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
+ threadId = ThreadUtil.getThreadId() ;
if (threadId != null)
{
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java 2007-02-02 16:49:24 UTC (rev 9303)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java 2007-02-02 17:46:23 UTC (rev 9304)
@@ -31,6 +31,7 @@
package com.arjuna.ats.jts.orbspecific.jacorb.interceptors.interposition;
+import com.arjuna.ats.arjuna.utils.ThreadUtil;
import com.arjuna.ats.internal.jts.ControlWrapper;
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.OTSImpleManager;
@@ -185,7 +186,7 @@
throw new UNKNOWN(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.invalidparam"));
}
else
- threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
+ threadId = ThreadUtil.getThreadId() ;
if (threadId != null)
{
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextClientRequestInterceptorImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextClientRequestInterceptorImpl.java 2007-02-02 16:49:24 UTC (rev 9303)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextClientRequestInterceptorImpl.java 2007-02-02 17:46:23 UTC (rev 9304)
@@ -31,6 +31,7 @@
package com.arjuna.ats.jts.orbspecific.javaidl.interceptors.context;
+import com.arjuna.ats.arjuna.utils.ThreadUtil;
import com.arjuna.ats.internal.jts.ControlWrapper;
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.OTSImpleManager;
@@ -205,7 +206,7 @@
throw new UNKNOWN(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.invalidparam"));
}
else
- threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
+ threadId = ThreadUtil.getThreadId() ;
if (threadId != null)
{
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java 2007-02-02 16:49:24 UTC (rev 9303)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java 2007-02-02 17:46:23 UTC (rev 9304)
@@ -31,6 +31,7 @@
package com.arjuna.ats.jts.orbspecific.javaidl.interceptors.interposition;
+import com.arjuna.ats.arjuna.utils.ThreadUtil;
import com.arjuna.ats.internal.jts.ControlWrapper;
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.OTSImpleManager;
@@ -204,7 +205,7 @@
throw new UNKNOWN(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.invalidparam"));
}
else
- threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
+ threadId = ThreadUtil.getThreadId() ;
if (threadId != null)
{
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/interceptors/context/ContextClientRequestInterceptorImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/interceptors/context/ContextClientRequestInterceptorImpl.java 2007-02-02 16:49:24 UTC (rev 9303)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/interceptors/context/ContextClientRequestInterceptorImpl.java 2007-02-02 17:46:23 UTC (rev 9304)
@@ -34,6 +34,7 @@
import com.arjuna.common.util.propertyservice.PropertyManager;
import com.arjuna.ats.arjuna.common.*;
+import com.arjuna.ats.arjuna.utils.ThreadUtil;
import com.arjuna.ats.jts.*;
import com.arjuna.ats.jts.common.InterceptorInfo;
@@ -193,7 +194,7 @@
throw new UNKNOWN(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.orbix2000.interceptors.context.invalidparam"));
}
else
- threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
+ threadId = ThreadUtil.getThreadId() ;
if (threadId != null)
{
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java 2007-02-02 16:49:24 UTC (rev 9303)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/interceptors/interposition/InterpositionClientRequestInterceptorImpl.java 2007-02-02 17:46:23 UTC (rev 9304)
@@ -34,6 +34,7 @@
import com.arjuna.common.util.propertyservice.PropertyManager;
import com.arjuna.ats.arjuna.common.*;
+import com.arjuna.ats.arjuna.utils.ThreadUtil;
import com.arjuna.ats.jts.*;
import com.arjuna.ats.jts.common.Environment;
@@ -193,7 +194,7 @@
throw new UNKNOWN(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.orbix2000.interceptors.interposition.invalidparam"));
}
else
- threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
+ threadId = ThreadUtil.getThreadId() ;
if (threadId != null)
{
Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/PropagationContextManager.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/PropagationContextManager.java 2007-02-02 16:49:24 UTC (rev 9303)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/PropagationContextManager.java 2007-02-02 17:46:23 UTC (rev 9304)
@@ -45,6 +45,7 @@
import java.util.Hashtable;
import java.io.Serializable;
+import com.arjuna.ats.arjuna.utils.ThreadUtil;
import com.arjuna.ats.internal.jts.ControlWrapper;
import com.arjuna.ats.internal.jts.OTSImpleManager;
import com.arjuna.ats.jta.TransactionManager;
@@ -68,7 +69,7 @@
log.debug("PropagationContextManager.getTransactionPropagationContext - called");
}
- final String threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
+ final String threadId = ThreadUtil.getThreadId() ;
ControlWrapper theControl;
if (threadId != null)
More information about the jboss-svn-commits
mailing list