[jboss-svn-commits] JBL Code SVN: r29885 - in labs/jbosstm/trunk: ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common and 22 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Nov 2 04:54:30 EST 2009
Author: jhalliday
Date: 2009-11-02 04:54:29 -0500 (Mon, 02 Nov 2009)
New Revision: 29885
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/ActivationRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/CadaverActivationRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/CadaverRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/DisposeRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/LastResourceRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/PersistenceRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/RecoveryRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Mutex.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/AbstractRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/ActionHierarchy.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/InputObjectState.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/OutputObjectState.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/FileLock.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/LogWriteStateManager.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperElement.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperThread.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperWorkerThread.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/gandiva/inventory/DynamicInventory.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ActionStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/CacheStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileLockingStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedActionStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCActionStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/NullActionStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowNoFileLockStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/VolatileStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/AtomicActionRecoveryModule.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredEntryMonitor.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/Listener.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/PeriodicRecovery.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/RecActivatorLoader.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/TransactionStatusManagerItem.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/WorkerService.java
labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/internal/tsmx/mbeans/PropertyServiceJMXPlugin.java
labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/TransactionServiceMX.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/lockstore/BasicPersistentLockStore.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/LockManager.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionManager.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAOnePhaseResource.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/resources/arjuna/Interposition.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/TransactionRecoveryModule.java
labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/ACCoordinatorRecoveryModule.java
labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/SubordinateCoordinatorRecoveryModule.java
labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/BACoordinatorRecoveryModule.java
labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/at/ATParticipantRecoveryModule.java
labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/ba/BAParticipantRecoveryModule.java
labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/LogNoi18nImpl.java
labs/jbosstm/trunk/common/classes/com/arjuna/common/util/logging/LogNoi18n.java
Log:
Cleanup CLF usage. JBTM-638 and JBTM-612
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/ActivationRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/ActivationRecord.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/ActivationRecord.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -34,10 +34,8 @@
import com.arjuna.ats.arjuna.logging.tsLogger;
import com.arjuna.ats.arjuna.logging.FacilityCode;
-import com.arjuna.ats.arjuna.ArjunaNames;
import com.arjuna.ats.arjuna.StateManager;
import com.arjuna.ats.arjuna.coordinator.*;
-import com.arjuna.ats.arjuna.common.*;
import com.arjuna.ats.arjuna.state.*;
import java.io.PrintWriter;
@@ -63,7 +61,7 @@
actionHandle = action;
state = st;
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC,
@@ -98,7 +96,7 @@
public int nestedAbort ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC, "ActivationRecord::nestedAbort() for "+order());
@@ -121,7 +119,7 @@
public int nestedCommit ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC, "ActivationRecord::nestedCommit() for "+order());
@@ -132,7 +130,7 @@
public int nestedPrepare ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC, "ActivationRecord::nestedPrepare() for "+order());
@@ -148,7 +146,7 @@
public int topLevelAbort ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC, "ActivationRecord::topLevelAbort() for "+order());
@@ -164,7 +162,7 @@
public int topLevelCommit ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC,
@@ -181,7 +179,7 @@
public int topLevelPrepare ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC,
@@ -274,7 +272,7 @@
actionHandle = null;
state = ObjectStatus.PASSIVE;
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_ABSTRACT_REC, "ActivationRecord::ActivationRecord()");
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/CadaverActivationRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/CadaverActivationRecord.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/CadaverActivationRecord.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -35,7 +35,6 @@
import com.arjuna.ats.arjuna.logging.FacilityCode;
import com.arjuna.ats.arjuna.coordinator.*;
-import com.arjuna.ats.arjuna.common.*;
import com.arjuna.common.util.logging.*;
@@ -51,7 +50,7 @@
{
super(ObjectStatus.PASSIVE, sm, null);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC,
@@ -70,7 +69,7 @@
public int nestedAbort ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC,
@@ -82,7 +81,7 @@
public int nestedCommit ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC,
@@ -94,7 +93,7 @@
public int nestedPrepare ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC,
@@ -106,7 +105,7 @@
public int topLevelAbort ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC,
@@ -118,7 +117,7 @@
public int topLevelCommit ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ABSTRACT_REC,
"CadaverActivationRecord::topLevelCommit() for "+get_uid());
@@ -129,7 +128,7 @@
public int topLevelPrepare ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ABSTRACT_REC,
"CadaverActivationRecord::topLevelPrepare() for "+get_uid());
@@ -164,7 +163,7 @@
{
super();
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_ABSTRACT_REC,
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/CadaverRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/CadaverRecord.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/CadaverRecord.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -36,7 +36,6 @@
import com.arjuna.ats.arjuna.coordinator.*;
import com.arjuna.ats.arjuna.objectstore.ObjectStore;
-import com.arjuna.ats.arjuna.common.*;
import com.arjuna.ats.arjuna.state.*;
import com.arjuna.ats.arjuna.gandiva.ClassName;
import java.io.PrintWriter;
@@ -96,7 +95,7 @@
// ObjectStore.reference(store);
}
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC,
@@ -146,7 +145,7 @@
public int nestedAbort ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC, "CadaverRecord::nestedAbort() for "+order());
@@ -186,7 +185,7 @@
public int nestedPrepare ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC, "CadaverRecord::nestedPrepare() for "+order());
@@ -204,7 +203,7 @@
public int topLevelAbort ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC, "CadaverRecord::topLevelAbort() for "+order());
@@ -235,7 +234,7 @@
public int topLevelCommit ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC, "CadaverRecord::topLevelCommit() for "+order());
@@ -272,7 +271,7 @@
public int topLevelPrepare ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC, "CadaverRecord::topLevelPrepare() for "+order());
@@ -449,7 +448,7 @@
oType = RecordType.NONE_RECORD;
store = null;
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_ABSTRACT_REC, "CadaverRecord::CadaverRecord ()");
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/DisposeRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/DisposeRecord.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/DisposeRecord.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -74,7 +74,7 @@
typeName = null;
}
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC,
@@ -99,7 +99,7 @@
public int nestedAbort ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC, "DisposeRecord::nestedAbort() for "+order());
@@ -110,7 +110,7 @@
public int nestedCommit ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC, "DisposeRecord::nestedCommit() for "+order());
@@ -121,7 +121,7 @@
public int nestedPrepare ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC, "DisposeRecord::nestedPrepare() for "+order());
@@ -135,7 +135,7 @@
public int topLevelAbort ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC, "DisposeRecord::topLevelAbort() for "+order());
@@ -152,7 +152,7 @@
public int topLevelCommit ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC, "DisposeRecord::topLevelCommit() for "+order());
@@ -189,7 +189,7 @@
public int topLevelPrepare ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ABSTRACT_REC,
"DisposeRecord::topLevelPrepare() for "+order());
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/LastResourceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/LastResourceRecord.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/LastResourceRecord.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -71,7 +71,7 @@
{
super(ONE_PHASE_RESOURCE_UID);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ABSTRACT_REC, "LastResourceRecord()");
}
@@ -96,7 +96,7 @@
public int nestedAbort ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ABSTRACT_REC, "LastResourceRecord::nestedAbort() for "
+ order());
@@ -107,7 +107,7 @@
public int nestedCommit ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ABSTRACT_REC, "LastResourceRecord::nestedCommit() for "
+ order());
@@ -122,7 +122,7 @@
public int nestedPrepare ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ABSTRACT_REC, "LastResourceRecord::nestedPrepare() for "
+ order());
@@ -133,7 +133,7 @@
public int topLevelAbort ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ABSTRACT_REC, "LastResourceRecord::topLevelAbort() for "
+ order());
@@ -151,7 +151,7 @@
public int topLevelCommit ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ABSTRACT_REC, "LastResourceRecord::topLevelCommit() for "
+ order());
@@ -162,7 +162,7 @@
public int topLevelPrepare ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ABSTRACT_REC, "LastResourceRecord::topLevelPrepare() for "
+ order());
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/PersistenceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/PersistenceRecord.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/PersistenceRecord.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -135,7 +135,7 @@
{
super(os, sm);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ABSTRACT_REC, "PersistenceRecord::PersistenceRecord("
+ os + ", " + sm.get_uid() + ")");
@@ -168,7 +168,7 @@
public int topLevelAbort ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ABSTRACT_REC, "PersistenceRecord::topLevelAbort() for "
+ order());
@@ -226,7 +226,7 @@
public int topLevelCommit ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ABSTRACT_REC, "PersistenceRecord::topLevelCommit() for "
+ order());
@@ -238,7 +238,7 @@
{ order(), getTypeOfObject() });
}
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
if (store != null)
{
@@ -324,7 +324,7 @@
public int topLevelPrepare ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ABSTRACT_REC, "PersistenceRecord::topLevelPrepare() for "
+ order());
@@ -401,7 +401,7 @@
public int topLevelCleanup ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ABSTRACT_REC, "PersistenceRecord::topLevelCleanup() for "
+ order());
@@ -421,7 +421,7 @@
public boolean restore_state (InputObjectState os, int ot)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ABSTRACT_REC, "PersistenceRecord::restore_state() for "
+ order());
@@ -475,7 +475,7 @@
public boolean save_state (OutputObjectState os, int ot)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ABSTRACT_REC, "PersistenceRecord::save_state() for "
+ order());
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/RecoveryRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/RecoveryRecord.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/RecoveryRecord.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -37,10 +37,8 @@
import com.arjuna.common.util.logging.*;
import com.arjuna.ats.arjuna.coordinator.*;
-import com.arjuna.ats.arjuna.objectstore.ObjectStore;
-import com.arjuna.ats.arjuna.common.*;
import com.arjuna.ats.arjuna.state.*;
-import com.arjuna.ats.internal.arjuna.thread.ThreadActionData;
+
import java.io.PrintWriter;
class RecoveryRecord extends AbstractRecord
@@ -55,7 +53,7 @@
{
super(sm.get_uid(), sm.type(), ObjectType.ANDPERSISTENT);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC,
@@ -69,7 +67,7 @@
public void finalize () throws Throwable
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.DESTRUCTORS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC, "RecoveryRecord.finalize() for "+order() + " type " + type());
@@ -111,7 +109,7 @@
public int nestedAbort ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC, "RecoveryRecord::nestedAbort() for "+order());
@@ -154,7 +152,7 @@
public int nestedCommit ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC, "RecoveryRecord::nestedCommit() for "+order());
@@ -165,7 +163,7 @@
public int nestedPrepare ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC, "RecoveryRecord::nestedPrepare() for "+order());
@@ -184,7 +182,7 @@
public int topLevelAbort ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC,
@@ -202,7 +200,7 @@
public int topLevelCommit ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC,
@@ -221,7 +219,7 @@
public int topLevelPrepare ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ABSTRACT_REC,
@@ -314,7 +312,7 @@
{
super();
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_ABSTRACT_REC, "RecoveryRecord::RecoveryRecord()"
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -153,7 +153,7 @@
public void finalize () throws Throwable
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.DESTRUCTORS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_STATE_MAN, "StateManager.finalize() for object-id "+get_uid() + " type " + type());
@@ -219,7 +219,7 @@
public synchronized boolean activate (String rootName)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_STATE_MAN,
"StateManager::activate( "+((rootName != null) ? rootName : "null")+") for object-id "+objectUid);
@@ -430,7 +430,7 @@
public synchronized boolean deactivate (String rootName, boolean commit)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_STATE_MAN,
"StateManager::deactivate("+((rootName != null) ? rootName : "null")+", "+commit+") for object-id " +objectUid);
@@ -639,7 +639,7 @@
public final String getStoreRoot ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_STATE_MAN, "StateManager::getStoreRoot ()");
@@ -655,7 +655,7 @@
public ObjectStore getStore ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_STATE_MAN, "StateManager::getStore ()");
@@ -777,7 +777,7 @@
protected void terminate ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_STATE_MAN,
@@ -841,7 +841,7 @@
objectUid = objUid;
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_STATE_MAN, "StateManager::StateManager( "+get_uid()+" )");
@@ -885,7 +885,7 @@
objectUid = new Uid();
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_STATE_MAN, "StateManager::StateManager( "+ot+" )");
@@ -919,7 +919,7 @@
if (objectUid == null)
objectUid = new Uid();
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_STATE_MAN, "StateManager::StateManager( "+objName+" )");
@@ -940,7 +940,7 @@
protected synchronized boolean modified ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_STATE_MAN, "StateManager::modified() for object-id "+get_uid());
@@ -1031,7 +1031,7 @@
protected final synchronized void persist ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_STATE_MAN, "StateManager::persist() for object-id "+get_uid());
@@ -1056,7 +1056,7 @@
protected final synchronized void cleanup (boolean fromTerminate)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_STATE_MAN, "StateManager::cleanup() for object-id "+get_uid());
@@ -1196,7 +1196,7 @@
protected synchronized void setupStore (String rootName)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED, FacilityCode.FAC_STATE_MAN,
"StateManager::setupStore ( "+((rootName != null) ? rootName : "null")+" )");
@@ -1354,7 +1354,7 @@
boolean committed,
int recordType)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_STATE_MAN, "StateManager::forgetAction("
@@ -1404,7 +1404,7 @@
protected final synchronized boolean rememberAction (BasicAction action, int recordType)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_STATE_MAN, "StateManager::rememberAction("
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Mutex.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Mutex.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Mutex.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -79,7 +79,7 @@
public int lock ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_GENERAL, "Mutex::lock()");
@@ -131,7 +131,7 @@
public int unlock ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_GENERAL, "Mutex::unlock()");
@@ -187,7 +187,7 @@
public int tryLock ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC,
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/AbstractRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/AbstractRecord.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/AbstractRecord.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -608,7 +608,7 @@
uidOfObject = storeUid;
typeOfObject = objType;
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PROTECTED, FacilityCode.FAC_ABSTRACT_REC, "AbstractRecord::AbstractRecord ("
+ storeUid + ", " + otype + ")");
@@ -630,7 +630,7 @@
uidOfObject = storeUid;
typeOfObject = null;
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PROTECTED, FacilityCode.FAC_ABSTRACT_REC, "AbstractRecord::AbstractRecord ("
+ storeUid + ")");
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/ActionHierarchy.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/ActionHierarchy.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/ActionHierarchy.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -64,7 +64,7 @@
public ActionHierarchy (int depth)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS,
VisibilityLevel.VIS_PUBLIC,
@@ -212,7 +212,7 @@
public final boolean add (Uid actionId, int at)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ATOMIC_ACTION, "ActionHierarchy::add("+actionId+", "+at+")");
@@ -372,7 +372,7 @@
public final int findCommonPrefix (ActionHierarchy oldHierarchy)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ATOMIC_ACTION, "ActionHierarchy::findCommonPrefix()");
@@ -387,7 +387,7 @@
common++;
}
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ATOMIC_ACTION,
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 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -297,7 +297,7 @@
{
super(ObjectType.NEITHER);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "BasicAction::BasicAction()");
}
@@ -334,7 +334,7 @@
{
super(objUid, ObjectType.NEITHER);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "BasicAction::BasicAction("
+ objUid + ")");
@@ -375,7 +375,7 @@
public void finalize ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.DESTRUCTORS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "BasicAction::finalize()");
}
@@ -489,7 +489,7 @@
public final boolean preventCommit ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "BasicAction::preventCommit( "+this+")");
}
@@ -700,7 +700,7 @@
public boolean activate (String root)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "BasicAction::activate() for action-id "
+ get_uid());
@@ -745,7 +745,7 @@
catch (ObjectStoreException e)
{
if (tsLogger.arjLogger.isWarnEnabled())
- tsLogger.arjLogger.warn(e.getMessage());
+ tsLogger.arjLogger.warn(e);
return false;
}
@@ -764,7 +764,7 @@
public boolean deactivate ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "BasicAction::deactivate() for action-id "
+ get_uid());
@@ -814,7 +814,7 @@
catch (ObjectStoreException e)
{
if (tsLogger.arjLogger.isWarnEnabled())
- tsLogger.arjLogger.warn(e.getMessage());
+ tsLogger.arjLogger.warn(e);
deactivated = false;
}
@@ -1129,7 +1129,7 @@
public boolean save_state (OutputObjectState os, int ot)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "BasicAction::save_state ()");
}
@@ -1360,7 +1360,7 @@
public boolean restore_state (InputObjectState os, int ot)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "BasicAction::restore_state ()");
}
@@ -1660,7 +1660,7 @@
protected synchronized int Begin (BasicAction parentAct)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED, FacilityCode.FAC_ATOMIC_ACTION, "BasicAction::Begin() for action-id "
+ get_uid());
@@ -1756,7 +1756,7 @@
protected synchronized int End (boolean reportHeuristics)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED, FacilityCode.FAC_ATOMIC_ACTION, "BasicAction::End() for action-id "
+ get_uid());
@@ -2140,7 +2140,7 @@
protected synchronized final void phase2Commit (boolean reportHeuristics)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED, FacilityCode.FAC_ATOMIC_ACTION, "BasicAction::phase2Commit() for action-id "
+ get_uid());
@@ -2256,7 +2256,7 @@
protected synchronized final void phase2Abort (boolean reportHeuristics)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED, FacilityCode.FAC_ATOMIC_ACTION, "BasicAction::phase2Abort() for action-id "
+ get_uid());
@@ -2322,7 +2322,7 @@
protected synchronized final int prepare (boolean reportHeuristics)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED, FacilityCode.FAC_ATOMIC_ACTION, "BasicAction::prepare () for action-id "
+ get_uid());
@@ -2433,8 +2433,7 @@
{
if (tsLogger.arjLogger.isWarnEnabled())
{
- tsLogger.arjLogger.warn("BasicAction.prepare - "
- + e);
+ tsLogger.arjLogger.warn(e);
}
p = TwoPhaseOutcome.PREPARE_NOTOK;
@@ -3200,7 +3199,7 @@
protected int doCommit (boolean reportHeuristics, AbstractRecord record)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PRIVATE, FacilityCode.FAC_ATOMIC_ACTION, "BasicAction::doCommit ("
+ record + ")");
@@ -3592,7 +3591,7 @@
}
catch (ObjectStoreException e)
{
- tsLogger.arjLogger.warn(e.getMessage());
+ tsLogger.arjLogger.warn(e);
}
}
}
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-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -125,7 +125,7 @@
private TransactionReaper(long checkPeriod)
{
- if (tsLogger.arjLogger.debugAllowed()) {
+ if (tsLogger.arjLogger.isDebugEnabled()) {
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS,
VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION,
"TransactionReaper::TransactionReaper ( " + checkPeriod
@@ -171,7 +171,7 @@
public final void check()
{
- if (tsLogger.arjLogger.debugAllowed()) {
+ if (tsLogger.arjLogger.isDebugEnabled()) {
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ATOMIC_ACTION, "TransactionReaper::check ()");
}
@@ -228,7 +228,7 @@
reinsertElement(reaperElement, _cancelWaitPeriod);
- if (tsLogger.arjLogger.debugAllowed()) {
+ if (tsLogger.arjLogger.isDebugEnabled()) {
tsLogger.arjLogger
.debug(
DebugLevel.FUNCTIONS,
@@ -261,7 +261,7 @@
reinsertElement(reaperElement, _cancelWaitPeriod);
- if (tsLogger.arjLogger.debugAllowed()) {
+ if (tsLogger.arjLogger.isDebugEnabled()) {
tsLogger.arjLogger
.debug(
DebugLevel.FUNCTIONS,
@@ -445,7 +445,7 @@
// ok, current status must be SCHEDULE_CANCEL.
// progress state to CANCEL and call cancel()
- if (tsLogger.arjLogger.debugAllowed()) {
+ if (tsLogger.arjLogger.isDebugEnabled()) {
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ATOMIC_ACTION, "Reaper Worker " + Thread.currentThread() + " attempting to cancel " + e._control.get_uid());
}
@@ -649,7 +649,7 @@
*/
public final void insert(Reapable control, int timeout)
{
- if (tsLogger.arjLogger.debugAllowed()) {
+ if (tsLogger.arjLogger.isDebugEnabled()) {
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION,
"TransactionReaper::insert ( " + control + ", " + timeout
@@ -704,7 +704,7 @@
// takes an Object because OTSManager.destroyControl(Control|ControlImple) uses PseudoControlWrapper not Reapable
public final void remove(Object control)
{
- if (tsLogger.arjLogger.debugAllowed()) {
+ if (tsLogger.arjLogger.isDebugEnabled()) {
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION,
"TransactionReaper::remove ( " + control + " )");
@@ -750,7 +750,7 @@
// arg is an Object because ArjunaTransactionImple.propagationContext does not have a Reapable
if ((_timeouts.isEmpty()) || (control == null)) {
- if (tsLogger.arjLogger.debugAllowed()) {
+ if (tsLogger.arjLogger.isDebugEnabled()) {
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ATOMIC_ACTION,
@@ -797,7 +797,7 @@
public final int getTimeout(Object control)
{
if ((_timeouts.isEmpty()) || (control == null)) {
- if (tsLogger.arjLogger.debugAllowed()) {
+ if (tsLogger.arjLogger.isDebugEnabled()) {
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ATOMIC_ACTION,
@@ -969,7 +969,7 @@
{
if (TransactionReaper._theReaper == null)
{
- if (tsLogger.arjLogger.debugAllowed()) {
+ if (tsLogger.arjLogger.isDebugEnabled()) {
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION,
"TransactionReaper::instantiate()");
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/InputObjectState.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/InputObjectState.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/InputObjectState.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -56,7 +56,7 @@
public InputObjectState ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_BUFFER_MAN, "InputObjectState::InputObjectState()");
@@ -71,7 +71,7 @@
{
super(copyFrom);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_BUFFER_MAN, "InputObjectState::InputObjectState("+copyFrom+")");
@@ -94,7 +94,7 @@
{
super(copyFrom.buffer());
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_BUFFER_MAN, "InputObjectState::InputObjectState("+copyFrom+")");
@@ -117,7 +117,7 @@
{
super(buff); // implicitly copies the array contents.
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_BUFFER_MAN,
@@ -192,7 +192,7 @@
public synchronized void copy (InputObjectState objstate)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
tsLogger.arjLogger.debug(DebugLevel.OPERATORS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_BUFFER_MAN, "InputObjectState::copy for "+bufferUid);
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/OutputObjectState.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/OutputObjectState.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/state/OutputObjectState.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -56,7 +56,7 @@
public OutputObjectState ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_BUFFER_MAN, "OutputObjectState::OutputObjectState()");
@@ -77,7 +77,7 @@
super(copyFrom);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_BUFFER_MAN,
@@ -101,7 +101,7 @@
{
super(copyFrom.buffer());
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_BUFFER_MAN,
@@ -123,7 +123,7 @@
public OutputObjectState (Uid newUid, String tName)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_BUFFER_MAN,
@@ -140,7 +140,7 @@
{
super(buffer);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_BUFFER_MAN,
@@ -205,7 +205,7 @@
public synchronized void copy (OutputObjectState objstate)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
tsLogger.arjLogger.debug(DebugLevel.OPERATORS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_BUFFER_MAN, "OutputObjectState::copy for "+bufferUid);
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/FileLock.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/FileLock.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/FileLock.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -81,7 +81,7 @@
public FileLock (File name)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS,
VisibilityLevel.VIS_PUBLIC,
@@ -97,7 +97,7 @@
public FileLock (File name, long timeout, long retry)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS,
VisibilityLevel.VIS_PUBLIC,
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/LogWriteStateManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/LogWriteStateManager.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/LogWriteStateManager.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -109,7 +109,7 @@
protected synchronized boolean modified ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_STATE_MAN, "StateManager::modified() for object-id "+get_uid());
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperElement.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperElement.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperElement.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -50,7 +50,7 @@
public ReaperElement(Reapable control, int timeout)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS,
VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION,
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperThread.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperThread.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperThread.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -64,7 +64,7 @@
public void run ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ATOMIC_ACTION, "ReaperThread.run ()");
@@ -113,7 +113,7 @@
}
}
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ATOMIC_ACTION, "ReaperThread.run ()");
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperWorkerThread.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperWorkerThread.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperWorkerThread.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -52,7 +52,7 @@
public void run ()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_ATOMIC_ACTION, "ReaperWorkerThread.run ()");
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/gandiva/inventory/DynamicInventory.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/gandiva/inventory/DynamicInventory.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/gandiva/inventory/DynamicInventory.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -129,8 +129,9 @@
}
catch (Exception e)
{
- if (tsLogger.arjLogger.isWarnEnabled())
- tsLogger.arjLogger.warn(e.toString());
+ if (tsLogger.arjLogger.isWarnEnabled()) {
+ tsLogger.arjLogger.warn(e);
+ }
}
ptr = _staticInventory.find(className);
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ActionStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ActionStore.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ActionStore.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -106,7 +106,7 @@
public boolean commit_state (Uid objUid,
String tName) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE,
@@ -128,7 +128,7 @@
public boolean hide_state (Uid u, String tn) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE, "ActionStore.hide_state("+u+", "+tn+")");
@@ -139,7 +139,7 @@
public boolean reveal_state (Uid u, String tn) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE, "ActionStore.reveal_state("+u+", "+tn+")");
@@ -150,7 +150,7 @@
public InputObjectState read_committed (Uid storeUid, String tName) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE, "ActionStore.read_committed("+storeUid+", "+tName+")");
@@ -161,7 +161,7 @@
public InputObjectState read_uncommitted (Uid u, String tn) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE, "ActionStore.read_uncommitted("+u+", "+tn+")");
@@ -172,7 +172,7 @@
public boolean remove_committed (Uid storeUid, String tName) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE, "ActionStore.remove_committed("+storeUid+", "+tName+")");
@@ -183,7 +183,7 @@
public boolean remove_uncommitted (Uid u, String tn) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE, "ActionStore.remove_uncommitted("+u+", "+tn+")");
@@ -194,7 +194,7 @@
public boolean write_committed (Uid storeUid, String tName, OutputObjectState state) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE, "ActionStore.write_committed("+storeUid+", "+tName+")");
@@ -205,7 +205,7 @@
public boolean write_uncommitted (Uid u, String tn, OutputObjectState s) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE, "ActionStore.write_uncommitted("+u+", "+tn+", "+s+")");
@@ -291,7 +291,7 @@
catch (ObjectStoreException e)
{
if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.arjLogger.warn(e.getMessage());
+ tsLogger.arjLogger.warn(e);
super.makeInvalid();
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/CacheStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/CacheStore.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/CacheStore.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -234,7 +234,7 @@
{
super(locationOfStore, shareStatus);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE, "CacheStore.CacheStore("+locationOfStore+")");
@@ -257,7 +257,7 @@
{
super(shareStatus);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE, "CacheStore.CacheStore( "+shareStatus+" )");
@@ -270,7 +270,7 @@
{
super(objName);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE, "CacheStore.CacheStore( "+objName+" )");
@@ -355,7 +355,7 @@
* So, just check that the thread isn't actively doing work.
*/
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE, "ShutdownThread.run () - terminating");
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileLockingStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileLockingStore.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileLockingStore.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -31,7 +31,6 @@
package com.arjuna.ats.internal.arjuna.objectstore;
-import com.arjuna.ats.arjuna.objectstore.*;
import com.arjuna.ats.arjuna.common.*;
import com.arjuna.ats.arjuna.utils.*;
import com.arjuna.ats.arjuna.state.*;
@@ -40,9 +39,6 @@
import java.io.*;
import com.arjuna.ats.arjuna.exceptions.ObjectStoreException;
-import java.lang.NumberFormatException;
-import java.io.IOException;
-import java.io.FileNotFoundException;
import com.arjuna.ats.arjuna.logging.tsLogger;
import com.arjuna.ats.arjuna.logging.FacilityCode;
@@ -69,7 +65,7 @@
{
super(locationOfStore, ss);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE, "FileLockingStore.FileLockingStore("+locationOfStore+")");
@@ -80,7 +76,7 @@
{
super(objName);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE, "FileLockingStore.FileLockingStore("+objName+")");
@@ -93,7 +89,7 @@
protected synchronized boolean lock (File fd, int lmode, boolean create)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE,
@@ -107,7 +103,7 @@
protected synchronized boolean unlock (File fd)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE, "FileLockingStore.unlock("+fd+")");
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -87,7 +87,7 @@
{
super(ss);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE,
@@ -106,7 +106,7 @@
{
isValid = false;
- tsLogger.arjLogger.warn(e.getMessage());
+ tsLogger.arjLogger.warn(e);
throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString(), e);
}
@@ -122,7 +122,7 @@
{
super(objName);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE, "FileSystemStore.FileSystemStore("+objName+")");
@@ -140,7 +140,7 @@
{
isValid = false;
- tsLogger.arjLogger.warn(e.getMessage());
+ tsLogger.arjLogger.warn(e);
throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString(), e);
}
@@ -158,7 +158,7 @@
public InputObjectState read_committed (Uid storeUid, String tName) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE, "FileSystemStore.read_committed("+storeUid+", "+tName+")");
@@ -169,7 +169,7 @@
public InputObjectState read_uncommitted (Uid storeUid, String tName) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE, "FileSystemStore.read_uncommitted("+storeUid+", "+tName+")");
@@ -180,7 +180,7 @@
public boolean remove_committed (Uid storeUid, String tName) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE,
@@ -192,7 +192,7 @@
public boolean remove_uncommitted (Uid storeUid, String tName) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE,
@@ -204,7 +204,7 @@
public boolean write_committed (Uid storeUid, String tName, OutputObjectState state) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE,
@@ -216,7 +216,7 @@
public boolean write_uncommitted (Uid storeUid, String tName, OutputObjectState state) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE,
@@ -248,7 +248,7 @@
public boolean allObjUids (String tName, InputObjectState state, int match) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE,
@@ -333,7 +333,7 @@
public boolean allTypes (InputObjectState foundTypes) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE, "FileSystemStore.allTypes("+foundTypes+")");
@@ -480,7 +480,7 @@
protected boolean closeAndUnlock (File fd, FileInputStream ifile, FileOutputStream ofile)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PRIVATE,
FacilityCode.FAC_OBJECT_STORE, "FileSystemStore.closeAndUnlock("+fd+", "+ifile+", "+ofile+")");
@@ -505,7 +505,7 @@
protected File openAndLock (String fname, int lmode, boolean create) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PRIVATE,
FacilityCode.FAC_OBJECT_STORE, "FileSystemStore.openAndLock("+fname+", "+FileLock.modeString(lmode)+", "+create+")");
@@ -637,7 +637,7 @@
protected boolean allTypes (OutputObjectState foundTypes, String root) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE,
@@ -695,7 +695,7 @@
protected String genPathName (Uid objUid,
String tName, int ostype) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE,
@@ -748,7 +748,7 @@
protected synchronized boolean setupStore (String localOSRoot) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE, "FileSystemStore.setupStore("+localOSRoot+")");
@@ -809,7 +809,7 @@
protected synchronized final boolean createHierarchy (String path) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE, "FileSystemStore.createHierarchy("+path+")");
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedActionStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedActionStore.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedActionStore.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -146,7 +146,7 @@
{
super(shareStatus);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE,
@@ -163,7 +163,7 @@
{
super(shareStatus);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE,
@@ -176,7 +176,7 @@
}
catch (ObjectStoreException e)
{
- tsLogger.arjLogger.warn(e.getMessage());
+ tsLogger.arjLogger.warn(e);
throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString(), e);
}
@@ -186,7 +186,7 @@
{
super(objName);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE, "HashedStore.HashedActionStore( "+objName+")");
@@ -198,7 +198,7 @@
}
catch (ObjectStoreException e)
{
- tsLogger.arjLogger.warn(e.getMessage());
+ tsLogger.arjLogger.warn(e);
throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString(), e);
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -149,7 +149,7 @@
public boolean allObjUids (String tName, InputObjectState state, int match) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE,
@@ -263,7 +263,7 @@
{
super(shareStatus);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE, "HashedStore.HashedStore( "+shareStatus+" )");
@@ -279,7 +279,7 @@
{
super(shareStatus);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE, "HashedStore.HashedStore("+locationOfStore+")");
@@ -291,7 +291,7 @@
}
catch (ObjectStoreException e)
{
- tsLogger.arjLogger.warn(e.getMessage());
+ tsLogger.arjLogger.warn(e);
throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString());
}
@@ -301,7 +301,7 @@
{
super(objName);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE, "HashedStore.HashedStore("+objName+")");
@@ -313,7 +313,7 @@
}
catch (ObjectStoreException e)
{
- tsLogger.arjLogger.warn(e.getMessage());
+ tsLogger.arjLogger.warn(e);
throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString(), e);
}
@@ -358,7 +358,7 @@
protected String genPathName (Uid objUid, String tName, int otype) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE,
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCActionStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCActionStore.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCActionStore.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -72,7 +72,7 @@
public synchronized boolean commit_state (Uid objUid,
String tName) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE,
@@ -94,7 +94,7 @@
public boolean hide_state (Uid u, String tn) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE, "JDBCActionStore.hide_state("+u+", "+tn+")");
@@ -105,7 +105,7 @@
public boolean reveal_state (Uid u, String tn) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE, "JDBCActionStore.reveal_state("+u+", "+tn+")");
@@ -116,7 +116,7 @@
public InputObjectState read_committed (Uid storeUid, String tName) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE, "JDBCActionStore.read_committed("+storeUid+", "+tName+")");
@@ -127,7 +127,7 @@
public InputObjectState read_uncommitted (Uid u, String tn) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE, "JDBCActionStore.read_uncommitted("+u+", "+tn+")");
@@ -138,7 +138,7 @@
public boolean remove_committed (Uid storeUid, String tName) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE, "JDBCActionStore.remove_committed("+storeUid+", "+tName+")");
@@ -149,7 +149,7 @@
public boolean remove_uncommitted (Uid u, String tn) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE, "JDBCActionStore.remove_uncommitted("+u+", "+tn+")");
@@ -160,7 +160,7 @@
public boolean write_committed (Uid storeUid, String tName, OutputObjectState state) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE, "JDBCActionStore.write_committed("+storeUid+", "+tName+")");
@@ -171,7 +171,7 @@
public boolean write_uncommitted (Uid u, String tn, OutputObjectState s) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE, "JDBCActionStore.write_uncommitted("+u+", "+tn+", "+s+")");
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCStore.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCStore.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -102,7 +102,7 @@
public boolean commit_state(Uid objUid, String tName)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_OBJECT_STORE,
@@ -120,7 +120,7 @@
public boolean hide_state(Uid objUid, String tName)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_OBJECT_STORE,
@@ -138,7 +138,7 @@
public boolean reveal_state(Uid objUid, String tName)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_OBJECT_STORE,
@@ -174,7 +174,7 @@
public InputObjectState read_committed(Uid storeUid, String tName)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger
.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
@@ -189,7 +189,7 @@
public InputObjectState read_uncommitted(Uid storeUid, String tName)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_OBJECT_STORE,
@@ -203,7 +203,7 @@
public boolean remove_committed(Uid storeUid, String tName)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_OBJECT_STORE,
@@ -217,7 +217,7 @@
public boolean remove_uncommitted(Uid storeUid, String tName)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_OBJECT_STORE,
@@ -231,7 +231,7 @@
public boolean write_committed(Uid storeUid, String tName,
OutputObjectState state) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_OBJECT_STORE,
@@ -245,7 +245,7 @@
public boolean write_uncommitted(Uid storeUid, String tName,
OutputObjectState state) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_OBJECT_STORE,
@@ -269,7 +269,7 @@
public boolean allObjUids(String tName, InputObjectState state, int match)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_OBJECT_STORE,
@@ -286,7 +286,7 @@
public boolean allTypes(InputObjectState foundTypes)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_OBJECT_STORE,
@@ -337,7 +337,7 @@
protected boolean remove_state(Uid objUid, String name, int ft)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PROTECTED,
@@ -388,7 +388,7 @@
protected JDBCStore()
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS,
VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_OBJECT_STORE,
@@ -407,7 +407,7 @@
protected JDBCStore(String tableName)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS,
VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_OBJECT_STORE,
@@ -426,7 +426,7 @@
protected JDBCStore(ObjectName objName)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS,
VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_OBJECT_STORE,
@@ -802,7 +802,7 @@
}
catch (Exception e)
{
- tsLogger.arjLogger.warn(e.toString());
+ tsLogger.arjLogger.warn(e);
throw e;
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -504,7 +504,7 @@
public boolean hide_state(Uid u, String tn) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_OBJECT_STORE,
@@ -516,7 +516,7 @@
public boolean reveal_state(Uid u, String tn) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_OBJECT_STORE,
@@ -529,7 +529,7 @@
public InputObjectState read_uncommitted(Uid u, String tn)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_OBJECT_STORE,
@@ -542,7 +542,7 @@
public boolean remove_uncommitted(Uid u, String tn)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_OBJECT_STORE,
@@ -555,7 +555,7 @@
public boolean write_committed(Uid storeUid, String tName,
OutputObjectState state) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger
.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
@@ -579,7 +579,7 @@
public boolean write_uncommitted(Uid u, String tn, OutputObjectState s)
throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_OBJECT_STORE,
@@ -773,7 +773,7 @@
catch (ObjectStoreException e)
{
if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.arjLogger.warn(e.getMessage());
+ tsLogger.arjLogger.warn(e);
super.makeInvalid();
@@ -832,7 +832,7 @@
protected boolean unlockAndClose(File fd, RandomAccessFile rf)
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PRIVATE, FacilityCode.FAC_OBJECT_STORE,
@@ -866,7 +866,7 @@
protected boolean write_state(Uid objUid, String tName,
OutputObjectState state, int ft) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS,
VisibilityLevel.VIS_PROTECTED,
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/NullActionStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/NullActionStore.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/NullActionStore.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -201,7 +201,7 @@
catch (ObjectStoreException e)
{
if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.arjLogger.warn(e.getMessage());
+ tsLogger.arjLogger.warn(e);
super.makeInvalid();
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowNoFileLockStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowNoFileLockStore.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowNoFileLockStore.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -32,11 +32,8 @@
package com.arjuna.ats.internal.arjuna.objectstore;
import com.arjuna.ats.arjuna.ArjunaNames;
-import com.arjuna.ats.arjuna.common.*;
import com.arjuna.ats.arjuna.objectstore.ObjectStore;
import com.arjuna.ats.arjuna.objectstore.ObjectStoreType;
-import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.ats.arjuna.state.*;
import com.arjuna.ats.arjuna.logging.tsLogger;
import com.arjuna.ats.arjuna.logging.FacilityCode;
@@ -46,8 +43,7 @@
import com.arjuna.ats.arjuna.gandiva.ClassName;
import com.arjuna.ats.arjuna.gandiva.ObjectName;
-import com.arjuna.ats.arjuna.utils.FileLock;
-import com.arjuna.ats.arjuna.utils.Utility;
+
import java.io.File;
/**
@@ -138,7 +134,7 @@
{
super(locationOfStore, shareStatus);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE, "ShadowNoFileLockStore.ShadowNoFileLockStore("+locationOfStore+")");
@@ -154,7 +150,7 @@
{
super(shareStatus);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE, "ShadowNoFileLockStore.ShadowNoFileLockStore( "+shareStatus+" )");
@@ -165,7 +161,7 @@
{
super(objName);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE, "ShadowNoFileLockStore.ShadowNoFileLockStore( "+objName+" )");
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -45,7 +45,6 @@
import com.arjuna.ats.arjuna.gandiva.ClassName;
import com.arjuna.ats.arjuna.utils.FileLock;
-import com.arjuna.ats.arjuna.utils.Utility;
import com.arjuna.ats.arjuna.gandiva.ObjectName;
import java.io.*;
import java.io.File;
@@ -166,7 +165,7 @@
public boolean commit_state (Uid objUid, String tName) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE, "ShadowingStore.commit_state("+objUid+", "+tName+")");
@@ -250,7 +249,7 @@
public boolean hide_state (Uid objUid, String tName) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE, "ShadowingStore.hide_state("+objUid+", "+tName+")");
@@ -338,7 +337,7 @@
public boolean reveal_state (Uid objUid,
String tName) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE, "ShadowingStore.reveal_state("+objUid+", "+tName+")");
@@ -483,7 +482,7 @@
protected String genPathName (Uid objUid, String tName, int ft) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE, "ShadowingStore.genPathName("+objUid+", "+tName+", "+ObjectStore.stateTypeString(ft)+")");
@@ -513,7 +512,7 @@
protected InputObjectState read_state (Uid objUid, String tName,
int ft) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE, "ShadowingStore.read_state("+objUid+", "+tName+", "+ObjectStore.stateTypeString(ft)+")");
@@ -603,7 +602,7 @@
protected boolean remove_state (Uid objUid, String name, int ft) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE, "ShadowingStore.remove_state("+objUid+", "+name+", "+ObjectStore.stateTypeString(ft)+")");
@@ -713,7 +712,7 @@
OutputObjectState state,
int ft) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE, "ShadowingStore.write_state("+objUid+", "+tName+", "+ObjectStore.stateTypeString(ft)+")");
@@ -809,7 +808,7 @@
{
super(shareStatus);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE, "ShadowingStore.ShadowingStore("+locationOfStore+")");
@@ -821,7 +820,7 @@
}
catch (ObjectStoreException e)
{
- tsLogger.arjLogger.fatal(e.getMessage());
+ tsLogger.arjLogger.fatal(e);
throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString(), e);
}
@@ -836,7 +835,7 @@
{
super(shareStatus);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE, "ShadowingStore.ShadowingStore( "+shareStatus+" )");
@@ -847,7 +846,7 @@
{
super(objName);
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PROTECTED,
FacilityCode.FAC_OBJECT_STORE, "ShadowingStore.ShadowingStore( "+objName+" )");
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/VolatileStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/VolatileStore.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/VolatileStore.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -33,8 +33,6 @@
import com.arjuna.common.util.logging.DebugLevel;
import com.arjuna.common.util.logging.VisibilityLevel;
-import java.util.Map;
-import java.util.HashMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -97,7 +95,7 @@
public int currentState(Uid u, String tn) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE,
@@ -169,7 +167,7 @@
public InputObjectState read_committed(Uid u, String tn) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE,
@@ -203,7 +201,7 @@
public boolean remove_committed(Uid u, String tn) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE,
@@ -239,7 +237,7 @@
public boolean write_committed(Uid u, String tn, OutputObjectState buff) throws ObjectStoreException
{
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_OBJECT_STORE,
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/AtomicActionRecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/AtomicActionRecoveryModule.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/AtomicActionRecoveryModule.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -60,6 +60,8 @@
* @message com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_1 [com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_1] - RecoveryManagerStatusModule: Object store exception: {0}
* @message com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_2 [com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_2] - failed to recover Transaction {0} {1}
* @message com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_3 [com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_3] - failed to access transaction store {0} {1}
+ * @message com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_4 [com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_4] - AtomicActionRecoveryModule first pass
+ * @message com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_5 [com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_5] - AtomicActionRecoveryModule second pass
*/
public class AtomicActionRecoveryModule implements RecoveryModule
@@ -96,9 +98,10 @@
try
{
- if (tsLogger.arjLogger.isDebugEnabled())
+ if (tsLogger.arjLoggerI18N.isDebugEnabled())
{
- tsLogger.arjLogger.debug( "StatusModule: first pass " );
+ tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_CRASH_RECOVERY,
+ "com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_4");
}
AtomicActions = _transactionStore.allObjUids( _transactionType, aa_uids );
@@ -121,9 +124,10 @@
public void periodicWorkSecondPass()
{
- if (tsLogger.arjLogger.isDebugEnabled())
+ if (tsLogger.arjLoggerI18N.isDebugEnabled())
{
- tsLogger.arjLogger.debug( "AtomicActionRecoveryModule: Second pass " );
+ tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_CRASH_RECOVERY,
+ "com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule_5");
}
processTransactionsStatus() ;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredEntryMonitor.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredEntryMonitor.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredEntryMonitor.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -66,6 +66,7 @@
* @message com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_9 [com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_9] - Expiry scanner {0} does not conform to ExpiryScanner interface
* @message com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_10 [com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_10] - Loading expiry scanner: could not find class {0}
* @message com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_11 [com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_11] - {0} has inappropriate value ({1})
+ * @message com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_12 [com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_12] - ExpiredEntryMonitor running at {0}
*/
public class ExpiredEntryMonitor extends Thread
@@ -165,10 +166,10 @@
{
while( true )
{
- if (tsLogger.arjLogger.isInfoEnabled())
+ if (tsLogger.arjLoggerI18N.isInfoEnabled())
{
- tsLogger.arjLogger.info("--- ExpiredEntryMonitor ----" +
- _theTimestamper.format(new Date()) + "----" );
+ tsLogger.arjLoggerI18N.info("com.arjuna.ats.internal.arjuna.recovery.ExpiredEntryMonitor_12",
+ new Object[] {_theTimestamper.format(new Date())});
}
if (_skipNext)
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/Listener.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/Listener.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/Listener.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -137,7 +137,7 @@
Connection new_conn = new Connection( conn, _listener_service, callback );
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug
( DebugLevel.FUNCTIONS,
@@ -159,7 +159,7 @@
catch (final SocketException ex)
{
// we get this if the socket is closed under a call to shutdown
- if (tsLogger.arjLogger.debugAllowed())
+ if (tsLogger.arjLogger.isDebugEnabled())
{
tsLogger.arjLogger.debug( DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_CRASH_RECOVERY,
"Recovery listener existing "+
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/PeriodicRecovery.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/PeriodicRecovery.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/PeriodicRecovery.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -71,6 +71,8 @@
* @message com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_11 [com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_11] - Invalid host specified {0}
* @message com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_12 [com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_12] - Could not create recovery listener
* @message com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_13 [com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_13] - Recovery manager listening on endpoint {0}:{1}
+ * @message com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_14 [com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_14] - Periodic recovery first pass at {0}
+ * @message com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_15 [com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_15] - Periodic recovery second pass at {0}
*/
public class PeriodicRecovery extends Thread
@@ -758,10 +760,10 @@
{
// n.b. we only get here if status is SCANNING
- if (tsLogger.arjLogger.isDebugEnabled())
+ if (tsLogger.arjLoggerI18N.isDebugEnabled())
{
- tsLogger.arjLogger.debug("Periodic recovery - first pass <" +
- _theTimestamper.format(new Date()) + ">" );
+ tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PRIVATE, FacilityCode.FAC_CRASH_RECOVERY,
+ "com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_14", new Object[] {_theTimestamper.format(new Date())});
}
// n.b. this works on a copy of the modules list so it is not affected by
@@ -818,10 +820,10 @@
// move on to phase 2
- if (tsLogger.arjLogger.isDebugEnabled())
+ if (tsLogger.arjLoggerI18N.isDebugEnabled())
{
- tsLogger.arjLogger.debug("Periodic recovery - second pass <"+
- _theTimestamper.format(new Date()) + ">" );
+ tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PRIVATE, FacilityCode.FAC_CRASH_RECOVERY,
+ "com.arjuna.ats.internal.arjuna.recovery.PeriodicRecovery_15", new Object[] {_theTimestamper.format(new Date())});
}
modules = _recoveryModules.elements();
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/RecActivatorLoader.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/RecActivatorLoader.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/RecActivatorLoader.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -43,6 +43,7 @@
* @message com.arjuna.ats.internal.arjuna.recovery.RecActivatorLoader_3 [com.arjuna.ats.internal.arjuna.recovery.RecActivatorLoader_3] - Loading recovery activator: {0}
* @message com.arjuna.ats.internal.arjuna.recovery.RecActivatorLoader_4 [com.arjuna.ats.internal.arjuna.recovery.RecActivatorLoader_4] - Loading recovery activator: {0}
* @message com.arjuna.ats.internal.arjuna.recovery.RecActivatorLoader_5 [com.arjuna.ats.internal.arjuna.recovery.RecActivatorLoader_5] - Loading recovery module: could not find class {0}
+ * @message com.arjuna.ats.internal.arjuna.recovery.RecActivatorLoader_6 [com.arjuna.ats.internal.arjuna.recovery.RecActivatorLoader_6] - Start RecoveryActivators
*/
public class RecActivatorLoader
@@ -66,9 +67,9 @@
public void startRecoveryActivators()
//public void run()
{
- if (tsLogger.arjLogger.isInfoEnabled())
+ if (tsLogger.arjLoggerI18N.isInfoEnabled())
{
- tsLogger.arjLogger.info("--- Start RecoveryActivators ");
+ tsLogger.arjLoggerI18N.info("com.arjuna.ats.internal.arjuna.recovery.RecActivatorLoader_6");
}
Enumeration activators = _recoveryActivators.elements();
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/TransactionStatusManagerItem.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/TransactionStatusManagerItem.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/TransactionStatusManagerItem.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -53,6 +53,7 @@
* @message com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_2 [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_2] - Problem with storing host/port {0}
* @message com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_3 [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_3] - Problem retrieving host/port {0}
* @message com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_4 [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_4] - Failed to obtain host {0}
+ * @message com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5 [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: {0} port: {1}
*/
// similar to FactoryContactItem
@@ -340,11 +341,9 @@
{
_host = InetAddress.getLocalHost().getHostAddress() ;
- if (tsLogger.arjLogger.isInfoEnabled())
+ if (tsLogger.arjLoggerI18N.isInfoEnabled())
{
- tsLogger.arjLogger.info
- ( "TransactionStatusManagerItem - " + "host: " + _host +
- " port: " + _port ) ;
+ tsLogger.arjLoggerI18N.info("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5", new Object[] {_host, _port});
}
}
catch ( UnknownHostException ex )
@@ -372,11 +371,9 @@
Utility.hostNameToInetAddress(host, "com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_4");
_host = host;
- if (tsLogger.arjLogger.isInfoEnabled())
+ if (tsLogger.arjLoggerI18N.isInfoEnabled())
{
- tsLogger.arjLogger.info
- ( "TransactionStatusManagerItem - " + "host: " + _host +
- " port: " + _port ) ;
+ tsLogger.arjLoggerI18N.info("com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5", new Object[] {_host, _port});
}
}
catch ( UnknownHostException ex )
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/WorkerService.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/WorkerService.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/WorkerService.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -80,7 +80,7 @@
// now we only need to hold one lock
_periodicRecovery.wakeUp();
- tsLogger.arjLogger.info("com.arjuna.ats.internal.arjuna.recovery.WorkerService_3");
+ tsLogger.arjLoggerI18N.info("com.arjuna.ats.internal.arjuna.recovery.WorkerService_3");
if (request.equals("SCAN"))
{
@@ -95,7 +95,7 @@
}
catch (Exception ex)
{
- tsLogger.arjLogger.info("com.arjuna.ats.internal.arjuna.recovery.WorkerService_4");
+ tsLogger.arjLoggerI18N.info("com.arjuna.ats.internal.arjuna.recovery.WorkerService_4");
}
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/internal/tsmx/mbeans/PropertyServiceJMXPlugin.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/internal/tsmx/mbeans/PropertyServiceJMXPlugin.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/internal/tsmx/mbeans/PropertyServiceJMXPlugin.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -78,11 +78,6 @@
/** Create the dynamic mbean for this property manager **/
mbean = new PropertyServiceMBeanWrapper(pm);
- if ( tsmxLogger.logger.isInfoEnabled() )
- {
- tsmxLogger.logger.info("Registering mbean for module '"+pm.getName()+"'");
- }
-
/** Register it with the current TSMX agent **/
TransactionServiceMX.getTransactionServiceMX().getAgentInterface().getAgent().registerMBean(mbean, mbean.getObjectName());
}
Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/TransactionServiceMX.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/TransactionServiceMX.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/TransactionServiceMX.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -72,7 +72,7 @@
protected TransactionServiceMX()
{
- if (tsmxLogger.logger.debugAllowed())
+ if (tsmxLogger.logger.isDebugEnabled())
{
tsmxLogger.logger.debug(DebugLevel.DESTRUCTORS, VisibilityLevel.VIS_PUBLIC,
tsmxFacilityCode.FAC_TS_MX, "TransactionService Management Extentions initialising");
@@ -117,11 +117,6 @@
/** Get the JMX agent implementation plugin, if none specified use reference implementation **/
String agentImpl = _tsmxProps.getProperty(AGENT_IMPLEMENTATION_PROPERTY, DEFAULT_AGENT_IMPLEMENTATION);
- if ( tsmxLogger.logger.isInfoEnabled() )
- {
- tsmxLogger.logger.info("Initialising JMX agent "+agentImpl);
- }
-
/** Create instance of JMX agent plugin **/
_agent = (AgentInterface) Thread.currentThread().getContextClassLoader().loadClass(agentImpl).newInstance();
}
@@ -193,7 +188,7 @@
Enumeration propNames = props.propertyNames();
HashSet foundProperties = new HashSet();
- if (tsmxLogger.logger.debugAllowed())
+ if (tsmxLogger.logger.isDebugEnabled())
{
tsmxLogger.logger.debug(DebugLevel.DESTRUCTORS, VisibilityLevel.VIS_PUBLIC,
tsmxFacilityCode.FAC_TS_MX, "Registering transaction service mbeans");
@@ -213,7 +208,7 @@
String mbeanObjectName = props.getProperty(getObjectPropertyName(mbeanName));
try
{
- if (tsmxLogger.logger.debugAllowed())
+ if (tsmxLogger.logger.isDebugEnabled())
{
tsmxLogger.logger.debug(DebugLevel.DESTRUCTORS, VisibilityLevel.VIS_PUBLIC,
tsmxFacilityCode.FAC_TS_MX, "Registering mbean '"+mbeanClassname+"' against '"+mbeanObjectName+"'");
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/lockstore/BasicPersistentLockStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/lockstore/BasicPersistentLockStore.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/internal/txoj/lockstore/BasicPersistentLockStore.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -68,7 +68,7 @@
public BasicPersistentLockStore (String key)
{
- if (txojLogger.aitLogger.debugAllowed())
+ if (txojLogger.aitLogger.isDebugEnabled())
{
txojLogger.aitLogger.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_LOCK_STORE, "BasicPersistentLockStore.BasicPersistentLockStore("+key+")");
@@ -87,7 +87,7 @@
public InputObjectState read_state (Uid u, String tName) throws LockStoreException
{
- if (txojLogger.aitLogger.debugAllowed())
+ if (txojLogger.aitLogger.isDebugEnabled())
{
txojLogger.aitLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_LOCK_STORE, "BasicPersistentLockStore.read_state("+u+", "+tName+")");
@@ -105,7 +105,7 @@
public boolean remove_state (Uid u, String tName)
{
- if (txojLogger.aitLogger.debugAllowed())
+ if (txojLogger.aitLogger.isDebugEnabled())
{
txojLogger.aitLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_LOCK_STORE, "BasicPersistentLockStore.remove_state("+u+", "+tName+")");
@@ -123,7 +123,7 @@
public boolean write_committed (Uid u, String tName, OutputObjectState state)
{
- if (txojLogger.aitLogger.debugAllowed())
+ if (txojLogger.aitLogger.isDebugEnabled())
{
txojLogger.aitLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
FacilityCode.FAC_LOCK_STORE,
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/LockManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/LockManager.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/LockManager.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -1218,7 +1218,7 @@
catch (LockStoreException e)
{
if (txojLogger.aitLogger.isWarnEnabled())
- txojLogger.aitLogger.warn(e.getMessage());
+ txojLogger.aitLogger.warn(e);
}
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionManager.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionManager.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -55,7 +55,7 @@
*/
/**
- * @message com.arjuna.ats.internal.jdbc.nojdbcimple Can't load ConnectionImple class.
+ * @message com.arjuna.ats.internal.jdbc.nojdbcimple Can't load ConnectionImple class {0}
*/
public static synchronized Connection create (String dbUrl, Properties info) throws SQLException
{
@@ -136,11 +136,12 @@
}
catch(Exception e)
{
- if (jdbcLogger.logger.isErrorEnabled())
+ if (jdbcLogger.loggerI18N.isErrorEnabled())
{
- jdbcLogger.logger.error(jdbcLogger.logMesg.getString("com.arjuna.ats.internal.jdbc.nojdbcimple")+" "+e.toString());
+ jdbcLogger.loggerI18N.error("com.arjuna.ats.internal.jdbc.nojdbcimple", new Object[] {connectionImpleClassName}, e);
}
- SQLException sqlException = new SQLException(jdbcLogger.logMesg.getString("com.arjuna.ats.internal.jdbc.nojdbcimple")+" "+e.toString());
+ SQLException sqlException = new SQLException(jdbcLogger.loggerI18N.getString("com.arjuna.ats.internal.jdbc.nojdbcimple",
+ new Object[] {connectionImpleClassName})+" "+e.toString());
sqlException.initCause(e);
throw sqlException;
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAOnePhaseResource.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAOnePhaseResource.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAOnePhaseResource.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -130,6 +130,9 @@
/**
* Commit the one phase resource.
* @return TwoPhaseOutcome.FINISH_OK or TwoPhaseOutcome.FINISH_ERROR
+ *
+ * @message com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.rollbackexception
+ * XAOnePhaseResource.rollback for {0} failed with exception {1}
*/
public int rollback()
{
@@ -140,9 +143,10 @@
}
catch (final XAException xae)
{
- if (jtaLogger.logger.isWarnEnabled())
+ if (jtaLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.logger.warn("XAOnePhaseResource.rollback(" + xid + ") " + xae.getMessage());
+ jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.rollbackexception",
+ new Object[] {xid, xae.getMessage()}, xae);
}
return TwoPhaseOutcome.FINISH_ERROR ;
}
@@ -153,7 +157,7 @@
* @param os The object output state.
*
* @message com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.pack
- * failed to serialise resource {0}
+ * XAOnePhaseResource.pack failed to serialise resource {0}
*/
public void pack(final OutputObjectState os)
throws IOException
@@ -181,11 +185,10 @@
}
catch (final IOException ioe)
{
- final String message = "XAOnePhaseResource.pack() " +
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.pack", new Object[] {ioe}) ;
- if (jtaLogger.logger.isWarnEnabled())
+ final String message = jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.pack", new Object[] {ioe}) ;
+ if (jtaLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.logger.warn(message);
+ jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.pack", new Object[] {ioe});
}
IOException ioException = new IOException(message);
ioException.initCause(ioe);
@@ -270,13 +273,13 @@
}
break ;
default:
- final String message = "XAOnePhaseResource.unpack() " +
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.unpackType",
- new Object[] {new Integer(recoveryType)}) ;
- if (jtaLogger.logger.isWarnEnabled())
+ if (jtaLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.logger.warn(message);
+ jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.unpackType",
+ new Object[] {new Integer(recoveryType)});
}
+ final String message = jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.unpackType",
+ new Object[] {new Integer(recoveryType)}) ;
throw new IOException(message) ;
}
}
@@ -288,12 +291,11 @@
*/
private static IOException generateUnpackError(final Exception ex)
{
- final String message = "XAOnePhaseResource.unpack() " +
- jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.unpack", new Object[] {ex}) ;
- if (jtaLogger.logger.isWarnEnabled())
+ if (jtaLogger.loggerI18N.isWarnEnabled())
{
- jtaLogger.logger.warn(message);
+ jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.unpack", new Object[] {ex}, ex);
}
+ final String message = jtaLogger.loggerI18N.getString("com.arjuna.ats.internal.jta.resources.arjunacore.XAOnePhaseResource.unpack", new Object[] {ex}) ;
return new IOException(message) ;
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/resources/arjuna/Interposition.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/resources/arjuna/Interposition.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/resources/arjuna/Interposition.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -512,6 +512,7 @@
* @message com.arjuna.ats.internal.jts.interposition.resources.arjuna.iptl TopLevel transactions not identical: {0} {1}
* @message com.arjuna.ats.internal.jts.interposition.resources.arjuna.ipnt Nested transactions not identical.
* @message com.arjuna.ats.internal.jts.interposition.resources.arjuna.ipnull Interposed hierarchy is null!
+ * @message com.arjuna.ats.internal.jts.interposition.resources.arjuna.problemhierarchy hierarchy: {0}
*/
protected final void compareHierarchies (PropagationContext ctx, ServerTopLevelAction action)
@@ -595,35 +596,29 @@
if (printHierarchies)
{
- synchronized (jtsLogger.logger)
- {
- if (!problem)
- {
- if (jtsLogger.logger.isDebugEnabled())
- {
- jtsLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- com.arjuna.ats.jts.logging.FacilityCode.FAC_OTS, Utility.getHierarchy(ctx));
- }
-
- if (jtsLogger.logger.isDebugEnabled())
- {
- jtsLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- com.arjuna.ats.jts.logging.FacilityCode.FAC_OTS, hierarchytoString(action));
- }
- }
- else
- {
- if (jtsLogger.logger.isWarnEnabled())
- {
- jtsLogger.logger.warn(Utility.getHierarchy(ctx));
- }
-
- if (jtsLogger.logger.isWarnEnabled())
- {
- jtsLogger.logger.warn(hierarchytoString(action));
- }
- }
- }
+ synchronized (jtsLogger.logger)
+ {
+ if (!problem)
+ {
+ if (jtsLogger.logger.isDebugEnabled())
+ {
+ jtsLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ com.arjuna.ats.jts.logging.FacilityCode.FAC_OTS, Utility.getHierarchy(ctx));
+ jtsLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ com.arjuna.ats.jts.logging.FacilityCode.FAC_OTS, hierarchytoString(action));
+ }
+ }
+ else
+ {
+ if (jtsLogger.loggerI18N.isWarnEnabled())
+ {
+ jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.interposition.resources.arjuna.problemhierarchy",
+ new Object[] {Utility.getHierarchy(ctx)});
+ jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.interposition.resources.arjuna.problemhierarchy",
+ new Object[] {hierarchytoString(action)});
+ }
+ }
+ }
}
if (ctxHierarchy != null)
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/TransactionRecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/TransactionRecoveryModule.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/TransactionRecoveryModule.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -68,6 +68,8 @@
* @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_8 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_8] - Transaction {0} is not in object store - assumed completed
* @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_9 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_9] - Activated transaction {0} status = {1}
* @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_10 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_10] - Transaction {0} still busy
+ * @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_11 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_11] - TransactionRecoveryModule.periodicWorkFirstPass()
+ * @message com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_12 [com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_12] - TransactionRecoveryModule.periodicWorkSecondPass()
*/
public abstract class TransactionRecoveryModule
{
@@ -91,9 +93,9 @@
*/
protected void periodicWorkFirstPass ()
{
- if (jtsLogger.logger.isInfoEnabled())
+ if (jtsLogger.loggerI18N.isInfoEnabled())
{
- jtsLogger.logger.info("TransactionRecoveryModule.periodicWorkFirstPass()");
+ jtsLogger.loggerI18N.info("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_11");
}
// Sanity check - make sure we know what type of transaction we're looking for
if (_transactionType == null)
@@ -171,9 +173,9 @@
protected void periodicWorkSecondPass ()
{
- if (jtsLogger.logger.isInfoEnabled())
+ if (jtsLogger.loggerI18N.isInfoEnabled())
{
- jtsLogger.logger.info("TransactionRecoveryModule.periodicWorkSecondPass()");
+ jtsLogger.loggerI18N.info("com.arjuna.ats.internal.jts.recovery.transactions.TransactionRecoveryModule_12");
}
// Process the Vector of transaction Uids
Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/ACCoordinatorRecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/ACCoordinatorRecoveryModule.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/ACCoordinatorRecoveryModule.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -105,7 +105,8 @@
{
if (XTSLogger.arjLogger.isDebugEnabled())
{
- XTSLogger.arjLogger.debug( "StatusModule: first pass " );
+ XTSLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY, "ACCoordinatorRecoveryModule: first pass");
}
ACCoordinators = _transactionStore.allObjUids( _transactionType, acc_uids );
@@ -130,7 +131,8 @@
{
if (XTSLogger.arjLogger.isDebugEnabled())
{
- XTSLogger.arjLogger.debug( "ACCoordinatorRecoveryModule: Second pass " );
+ XTSLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY, "ACCoordinatorRecoveryModule: Second pass");
}
if (_transactionUidVector != null) {
Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/SubordinateCoordinatorRecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/SubordinateCoordinatorRecoveryModule.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/SubordinateCoordinatorRecoveryModule.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -105,7 +105,8 @@
{
if (XTSLogger.arjLogger.isDebugEnabled())
{
- XTSLogger.arjLogger.debug( "StatusModule: first pass " );
+ XTSLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY, "SubordinateCoordinatorRecoveryModule: first pass ");
}
SubordinateCoordinators = _transactionStore.allObjUids( _transactionType, acc_uids );
@@ -130,7 +131,8 @@
{
if (XTSLogger.arjLogger.isDebugEnabled())
{
- XTSLogger.arjLogger.debug( "SubordinateCoordinatorRecoveryModule: Second pass " );
+ XTSLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY, "SubordinateCoordinatorRecoveryModule: Second pass");
}
if (_transactionUidVector != null) {
Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/BACoordinatorRecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/BACoordinatorRecoveryModule.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/BACoordinatorRecoveryModule.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -105,7 +105,8 @@
{
if (XTSLogger.arjLogger.isDebugEnabled())
{
- XTSLogger.arjLogger.debug( "StatusModule: first pass " );
+ XTSLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY, "BACoordinatorRecoveryModule: first pass");
}
ACCoordinators = _transactionStore.allObjUids( _transactionType, acc_uids );
@@ -130,7 +131,8 @@
{
if (XTSLogger.arjLogger.isDebugEnabled())
{
- XTSLogger.arjLogger.debug( "BACoordinatorRecoveryModule: Second pass " );
+ XTSLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY, "BACoordinatorRecoveryModule: Second pass");
}
if (_transactionUidVector != null) {
Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/at/ATParticipantRecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/at/ATParticipantRecoveryModule.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/at/ATParticipantRecoveryModule.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -121,7 +121,8 @@
{
if (XTSLogger.arjLogger.isDebugEnabled())
{
- XTSLogger.arjLogger.debug( "StatusModule: first pass " );
+ XTSLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY, "ATParticipantRecoveryModule: first pass");
}
ATParticipants = _objectStore.allObjUids(_participantType, acc_uids );
@@ -146,7 +147,8 @@
{
if (XTSLogger.arjLogger.isDebugEnabled())
{
- XTSLogger.arjLogger.debug( "ATParticipantRecoveryModule: Second pass " );
+ XTSLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY, "ATParticipantRecoveryModule: Second pass");
}
processParticipantsStatus() ;
Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/ba/BAParticipantRecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/ba/BAParticipantRecoveryModule.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/ba/BAParticipantRecoveryModule.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -107,7 +107,8 @@
{
if (XTSLogger.arjLogger.isDebugEnabled())
{
- XTSLogger.arjLogger.debug( "StatusModule: first pass " );
+ XTSLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY, "BAParticipantRecoveryModule: first pass");
}
BAParticipants = _objectStore.allObjUids(_participantType, acc_uids );
@@ -132,7 +133,8 @@
{
if (XTSLogger.arjLogger.isDebugEnabled())
{
- XTSLogger.arjLogger.debug( "BAParticipantRecoveryModule: Second pass " );
+ XTSLogger.arjLogger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY, "BAParticipantRecoveryModule: Second pass");
}
processParticipantsStatus() ;
Modified: labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/LogNoi18nImpl.java
===================================================================
--- labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/LogNoi18nImpl.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/LogNoi18nImpl.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -34,7 +34,8 @@
import com.arjuna.common.util.logging.FacilityCode;
/**
- * JavaDoc
+ * Logger for non-i18n messages. These should generally be debug (trace) level or raw exceptions. All
+ * textual messages at higher levels should go through the i18n logger instead.
*
* @author Thomas Rischbeck <thomas.rischbeck at arjuna.com>
* @version $Revision: 2342 $ $Date: 2006-03-30 14:06:17 +0100 (Thu, 30 Mar 2006) $
@@ -91,11 +92,20 @@
/**
* Determine if this logger is enabled for DEBUG messages.
+ *
+ * This method returns true when the following is set:
+ * <ul>
+ * <li>finer debug level = <code>DebugLevel.FULL_DEBUGGING</code>.</li>
+ * <li>visibility level = <code>VisibilityLevel.VIS_ALL</code>.</li>
+ * <li>facility code = <code>FacilityCode.FAC_ALL</code>.</li>
+ * </ul>
+ * and the debug level is enabled in the underlying logger.
+ *
* @return True if the logger is enabled for DEBUG, false otherwise
*/
public boolean isDebugEnabled()
{
- return m_logInterface.isDebugEnabled();
+ return debugAllowed(DebugLevel.FULL_DEBUGGING, VisibilityLevel.VIS_ALL, FacilityCode.FAC_ALL);
}
/**
@@ -138,24 +148,6 @@
/**************************** Debug Granularity Extension ***************************/
/**
- * Is it allowed to print finer debugging statements?
- *
- * This method returns true when the following is set:
- * <ul>
- * <li>finer debug level = <code>DebugLevel.FULL_DEBUGGING</code>.</li>
- * <li>visibility level = <code>VisibilityLevel.VIS_ALL</code>.</li>
- * <li>facility code = <code>FacilityCode.FAC_ALL</code>.</li>
- * </ul>
- *
- * @return true if the Logger allows full logging
- */
- public boolean debugAllowed()
- {
- return debugAllowed(DebugLevel.FULL_DEBUGGING, VisibilityLevel.VIS_ALL,
- FacilityCode.FAC_ALL);
- }
-
- /**
* Is it allowed to print finer debugging statements with a given debug level,
* visibility level and facility code level?
*
@@ -170,10 +162,9 @@
*/
private boolean debugAllowed(long dLevel, long vLevel, long fLevel)
{
- // check the underlying logger threshold as well as (but after, due to cost)
- // our own filters, as many use points call debugAllowed rather than isDebugEnabled.
+ // check the underlying logger threshold as well as (but after, due to cost) our own filters
return (((dLevel & m_debugLevel) != 0) && ((vLevel & m_visLevel) != 0) &&
- ((fLevel & m_facLevel) != 0) && isDebugEnabled());
+ ((fLevel & m_facLevel) != 0) && m_logInterface.isDebugEnabled());
}
/**********************************************************************************************************
@@ -213,7 +204,7 @@
*
* @param message the message to log
*/
- public void debug(String message)
+ private void debug(String message)
{
m_logInterface.debug(message);
}
@@ -223,7 +214,7 @@
*
* @param message the message to log
*/
- public void info(String message)
+ public void info(Throwable message)
{
m_logInterface.info(message);
}
@@ -233,7 +224,7 @@
*
* @param message the message to log
*/
- public void warn(String message)
+ public void warn(Throwable message)
{
m_logInterface.warn(message);
}
@@ -249,23 +240,12 @@
}
/**
- * Log a message with ERROR Level
- *
- * @param message the message to log
- */
- public void error(String message)
- {
- m_logInterface.error(message);
- }
-
- /**
* Log a message with FATAL Level
*
* @param message the message to log
*/
- public void fatal(String message)
+ public void fatal(Throwable message)
{
m_logInterface.fatal(message);
}
-
}
Modified: labs/jbosstm/trunk/common/classes/com/arjuna/common/util/logging/LogNoi18n.java
===================================================================
--- labs/jbosstm/trunk/common/classes/com/arjuna/common/util/logging/LogNoi18n.java 2009-11-02 02:51:24 UTC (rev 29884)
+++ labs/jbosstm/trunk/common/classes/com/arjuna/common/util/logging/LogNoi18n.java 2009-11-02 09:54:29 UTC (rev 29885)
@@ -32,6 +32,9 @@
* Non-internationalised logging interface abstracting the various logging APIs
* supported by Arjuna CLF.
*
+ * Non-i18n messages should generally be debug (trace) level or raw exceptions. All
+ * textual messages at higher levels should go through the i18n logger instead.
+ *
* See {@link Logi18n Logi18n} for an internationalised version and for more
* information.
*
@@ -73,6 +76,13 @@
/**
* Determine if this logger is enabled for DEBUG messages.
+ *
+ * This method returns true when the following is set:
+ * <ul>
+ * <li>finer debug level = <code>DebugLevel.FULL_DEBUGGING</code>.</li>
+ * <li>visibility level = <code>VisibilityLevel.VIS_ALL</code>.</li>
+ * <li>facility code = <code>FacilityCode.FAC_ALL</code>.</li>
+ *
* @return True if the logger is enabled for DEBUG, false otherwise
*/
boolean isDebugEnabled();
@@ -105,28 +115,19 @@
/************************ Log Debug Messages ****************************/
/**
- * Log a message with DEBUG Level
- *
- * @param message the message to log
- * @deprecated use debug(long dl, long vl, long fl, String message);
- */
- void debug(String message);
-
- /**
* Log a message with INFO Level
*
* @param message the message to log
- * @deprecated use i18n
+ * @deprecated exceptions at info level don't make a lot sense.
*/
- void info(String message);
+ void info(Throwable message);
/**
* Log a message with WARN Level
*
* @param message the message to log
- * @deprecated should take a Throwable
*/
- void warn(String message);
+ void warn(Throwable message);
/**
* Log a message with ERROR Level
@@ -136,20 +137,11 @@
void error(Throwable message);
/**
- * Log a message with ERROR Level
- *
- * @param message the message to log
- * @deprecated use I18n
- */
- void error(String message);
-
- /**
* Log a message with FATAL Level
*
* @param message the message to log
- * @deprecated use i18n instead
*/
- void fatal(String message);
+ void fatal(Throwable message);
/**
* Log a message with the DEBUG Level and with finer granularity. The debug message
@@ -170,21 +162,4 @@
* @param message The message to log.
*/
void debug(long dl, long vl, long fl, String message);
-
- /**************************** Debug Granularity Extension ***************************/
-
- /**
- * Is it allowed to print finer debugging statements?
- *
- * This method returns true when the following is set:
- * <ul>
- * <li>finer debug level = <code>DebugLevel.FULL_DEBUGGING</code>.</li>
- * <li>visibility level = <code>VisibilityLevel.VIS_ALL</code>.</li>
- * <li>facility code = <code>FacilityCode.FAC_ALL</code>.</li>
- * </ul>
- *
- * @return true if the Logger allows full logging
- * @deprecated replace with isDebugEnabled
- */
- boolean debugAllowed ();
}
More information about the jboss-svn-commits
mailing list