[jboss-svn-commits] JBL Code SVN: r24913 - labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jan 26 09:45:45 EST 2009
Author: jhalliday
Date: 2009-01-26 09:45:44 -0500 (Mon, 26 Jan 2009)
New Revision: 24913
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java
Log:
Remove unwanted debug statement. JBTM-462
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java 2009-01-26 12:35:26 UTC (rev 24912)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java 2009-01-26 14:45:44 UTC (rev 24913)
@@ -237,8 +237,6 @@
break;
}
- tsLogger.arjLogger.warn("**working on "+e);
-
if (tsLogger.arjLoggerI18N.isWarnEnabled())
{
tsLogger.arjLoggerI18N
@@ -844,7 +842,7 @@
synchronized(this)
{
removeElement(key);
-
+
return true;
}
}
@@ -948,17 +946,17 @@
/*
* Terminate the transaction reaper. This is a synchronous operation
* and will only return once the reaper has been shutdown cleanly.
- *
+ *
* Note, this method assumes that the transaction system has been
* shutdown already so no new transactions can be created, or we
* could be here for a long time!
- *
+ *
* @param waitForTransactions if <code>true</code> then the reaper will
* wait until all transactions have terminated (or been terminated by it).
* If <code>false</code> then the reaper will call setRollbackOnly on all
* the transactions.
*/
-
+
private final void shutdown (boolean waitForTransactions)
{
synchronized (_shutdownLock)
@@ -970,16 +968,16 @@
* periods to elapse before terminating, then we first start by enabling
* our time machine!
*/
-
+
if (!waitForTransactions)
{
Iterator iter = _transactions.iterator();
ReaperElement e;
-
+
while (iter.hasNext())
{
e = (ReaperElement) iter.next();
-
+
e._absoluteTimeout = 0;
}
}
@@ -1002,9 +1000,9 @@
synchronized (_reaperThread)
{
- _reaperThread.shutdown();
+ _reaperThread.shutdown();
_reaperThread.interrupt(); // by this stage there should be no transactions left anyway.
-
+
synchronized (this)
{
notify();
@@ -1015,14 +1013,14 @@
_reaperThread.join();
}
catch (final Exception ex)
- {
+ {
}
}
_reaperThread = null;
-
+
_reaperWorkerThread.shutdown();
-
+
synchronized (_reaperWorkerThread)
{
try
@@ -1031,35 +1029,35 @@
_reaperWorkerThread.join();
}
catch (final Exception ex)
- {
+ {
}
}
-
+
_reaperWorkerThread = null;
-
+
_inShutdown = false;
}
}
-
+
/*
* Remove element from list and trigger waiter if we are
* being shutdown.
*/
-
+
private final void removeElement (ReaperElement e)
{
synchronized (_shutdownLock)
{
_timeouts.remove(e._control);
_transactions.remove(e);
-
+
if (_inShutdown && (_transactions.size() == 0))
{
_shutdownLock.notify();
}
}
}
-
+
/**
* Currently we let the reaper thread run at same priority as other threads.
* Could get priority from environment.
@@ -1097,7 +1095,7 @@
}
}
}
-
+
if (!TransactionReaper._dynamic)
{
String timeoutEnv = arjPropertyManager.propertyManager
@@ -1251,17 +1249,17 @@
/**
* Terminate the transaction reaper. This is a synchronous operation
* and will only return once the reaper has been shutdown cleanly.
- *
+ *
* Note, this method assumes that the transaction system has been
* shutdown already so no new transactions can be created, or we
* could be here for a long time!
- *
+ *
* @param waitForTransactions if <code>true</code> then the reaper will
* wait until all transactions have terminated (or been terminated by it).
* If <code>false</code> then the reaper will call setRollbackOnly on all
* the transactions.
*/
-
+
public static void terminate (boolean waitForTransactions)
{
if (_theReaper != null)
@@ -1270,7 +1268,7 @@
_theReaper = null;
}
}
-
+
public static boolean isDynamic() {
return _dynamic;
}
@@ -1332,11 +1330,11 @@
private static long _lifetime = 0;
private static int _zombieCount = 0;
-
+
/*
* Shutdown lock.
*/
-
+
private static final Object _shutdownLock = new Object();
private static boolean _inShutdown = false;
}
More information about the jboss-svn-commits
mailing list