[jboss-svn-commits] JBL Code SVN: r33573 - in labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats: arjuna/common and 15 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jun 21 11:41:31 EDT 2010
Author: jhalliday
Date: 2010-06-21 11:41:30 -0400 (Mon, 21 Jun 2010)
New Revision: 33573
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Uid.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/BasicAction.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/CheckedAction.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/tsLogger.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/objectstore/ObjectStoreType.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/ActionStatusService.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoverAtomicAction.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoveryManager.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusConnectionManager.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusManager.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/StateManagerWrapper.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/UidWrapper.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/util/JMXServer.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/FileLock.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/Utility.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/TxLogWritePersistenceRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/ActivationRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/CadaverRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/DisposeRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/LastResourceRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/PersistenceRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/RecoveryRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/StateManagerFriend.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/common/BasicMutex.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/FileSystemStore.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/JDBCImple.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/ShadowingStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/jdbc/oracle_driver.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/Connection.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/ExpiredTransactionScanner.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionStatusManagerScanner.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/RecoveryManagerImple.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/TransactionStatusConnector.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/arjuna/classes/com/arjuna/ats/internal/arjuna/tools/log/EditableAtomicAction.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/ExecProcessId.java
Log:
Remove redundant guard statements from i18n logging in ArjunaCore. JBTM-750
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -331,14 +331,11 @@
{
if (curr instanceof AtomicAction)
ThreadActionData.purgeActions();
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_ats_atomicaction_1(curr.toString());
- }
+ else {
+ tsLogger.i18NLogger.warn_ats_atomicaction_1(curr.toString());
- curr = null;
- }
+ curr = null;
+ }
}
return (AtomicAction) curr;
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 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -191,10 +191,8 @@
{
BasicAction action = BasicAction.Current();
- if ((action != null) && (action.status() == ActionStatus.RUNNING))
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_StateManager_1();
+ if ((action != null) && (action.status() == ActionStatus.RUNNING)) {
+ tsLogger.i18NLogger.warn_StateManager_1();
cleanup(false);
}
}
@@ -345,11 +343,8 @@
oldState = null;
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_StateManager_2(objectUid, type());
- }
+ else {
+ tsLogger.i18NLogger.warn_StateManager_2(objectUid, type());
return false;
}
@@ -493,18 +488,14 @@
result = objectStore.write_uncommitted(objectUid,
tn, newState);
}
- catch (ObjectStoreException e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_StateManager_3(e);
+ catch (ObjectStoreException e) {
+ tsLogger.i18NLogger.warn_StateManager_3(e);
result = false;
}
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_StateManager_4();
+ else {
+ tsLogger.i18NLogger.warn_StateManager_4();
}
/*
@@ -578,13 +569,10 @@
{
DisposeRecord dr = new DisposeRecord(objectStore, this);
- if (action.add(dr) != AddOutcome.AR_ADDED)
- {
+ if (action.add(dr) != AddOutcome.AR_ADDED) {
dr = null;
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_StateManager_6(action.get_uid());
- }
+ tsLogger.i18NLogger.warn_StateManager_6(action.get_uid());
}
else
result = true;
@@ -602,24 +590,19 @@
if (result)
destroyed();
}
- catch (Exception e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_StateManager_7(e);
+ catch (Exception e) {
+ tsLogger.i18NLogger.warn_StateManager_7(e);
result = false;
}
}
}
- else
- {
+ else {
/*
* Not a persistent object!
*/
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_StateManager_8();
- }
+ tsLogger.i18NLogger.warn_StateManager_8();
}
return result;
@@ -781,11 +764,8 @@
if (!txId.equals(Uid.nullUid()))
processUid = UidHelper.unpackFrom(os);
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_StateManager_9();
- }
+ else {
+ tsLogger.i18NLogger.warn_StateManager_9();
throw new IOException(tsLogger.i18NLogger.get_StateManager_15());
}
@@ -947,11 +927,9 @@
return true;
}
- if (currentStatus == ObjectStatus.PASSIVE)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_StateManager_10();
-
+ if (currentStatus == ObjectStatus.PASSIVE) {
+ tsLogger.i18NLogger.warn_StateManager_10();
+
activate();
}
@@ -1081,34 +1059,26 @@
int rStatus = AddOutcome.AR_ADDED;
if ((currentStatus == ObjectStatus.ACTIVE_NEW)
- || (currentStatus == ObjectStatus.ACTIVE))
- {
+ || (currentStatus == ObjectStatus.ACTIVE)) {
OutputObjectState state = null;
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_StateManager_11(objectUid, type());
- }
+ tsLogger.i18NLogger.warn_StateManager_11(objectUid, type());
/*
* If we get here via terminate its ok to do a
* save_state.
*/
- if (fromTerminate)
- {
+ if (fromTerminate) {
state = new OutputObjectState(objectUid, type());
- if (!save_state(state, myType))
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_StateManager_12();
+ if (!save_state(state, myType)) {
+ tsLogger.i18NLogger.warn_StateManager_12();
/* force action abort */
action.preventCommit();
}
- }
- else
- {
+ } else {
/* otherwise force action abort */
action.preventCommit();
@@ -1135,12 +1105,9 @@
{
currentStatus = ObjectStatus.PASSIVE;
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_StateManager_6(action.get_uid());
- }
-
+ else {
+ tsLogger.i18NLogger.warn_StateManager_6(action.get_uid());
+
record = null;
}
}
@@ -1269,16 +1236,14 @@
+ " " + objectStoreType);
}
}
- else
- {
+ else {
/*
* Currently we should never get here! However, since Arjuna
* supports a volatile (in memory) object store we will also
* eventually, probably through a set of native methods.
*/
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_StateManager_13();
+ tsLogger.i18NLogger.warn_StateManager_13();
throw new FatalError(tsLogger.i18NLogger.get_StateManager_14());
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Uid.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Uid.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Uid.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -128,10 +128,8 @@
generateHash();
}
- catch (UnknownHostException e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_common_Uid_1();
+ catch (UnknownHostException e) {
+ tsLogger.i18NLogger.warn_common_Uid_1();
_valid = false;
}
}
@@ -168,11 +166,9 @@
_valid = true;
}
- catch (final Throwable ex)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_common_Uid_bytes(ex);
-
+ catch (final Throwable ex) {
+ tsLogger.i18NLogger.warn_common_Uid_bytes(ex);
+
_valid = false;
}
@@ -259,31 +255,22 @@
}
catch (NumberFormatException e)
{
- if (!errsOk)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_common_Uid_3(uidString, e);
- }
+ if (!errsOk) {
+ tsLogger.i18NLogger.warn_common_Uid_3(uidString, e);
}
_valid = false;
}
catch (StringIndexOutOfBoundsException e)
{
- if (!errsOk)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_common_Uid_3(uidString, e);
- }
+ if (!errsOk) {
+ tsLogger.i18NLogger.warn_common_Uid_3(uidString, e);
}
_valid = false;
}
- catch (final Throwable ex)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_common_Uid_npe(uidString, ex);
- }
+ catch (final Throwable ex) {
+ tsLogger.i18NLogger.warn_common_Uid_npe(uidString, ex);
_valid = false;
}
@@ -310,9 +297,7 @@
}
catch (Exception e)
{
- if (tsLogger.arjLoggerI18N.isFatalEnabled()) {
- tsLogger.i18NLogger.fatal_common_Uid_4(uidString);
- }
+ tsLogger.i18NLogger.fatal_common_Uid_4(uidString);
throw new FatalError(tsLogger.i18NLogger.get_common_Uid_2(), e);
}
@@ -429,11 +414,9 @@
_byteForm = ba.toByteArray();
}
- catch (final Throwable ex)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_common_Uid_getbytes(ex);
-
+ catch (final Throwable ex) {
+ tsLogger.i18NLogger.warn_common_Uid_getbytes(ex);
+
_byteForm = null;
}
}
@@ -758,10 +741,8 @@
if (_hashValue < 0)
_hashValue = -_hashValue;
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_common_Uid_6();
+ else {
+ tsLogger.i18NLogger.warn_common_Uid_6();
}
}
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 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/AbstractRecord.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -449,14 +449,11 @@
return (AbstractRecord) recordClass.newInstance();
}
- catch (final NullPointerException ex)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_AbstractRecord_npe(Integer.toString(type));
- }
-
- return null;
- }
+ catch (final NullPointerException ex) {
+ tsLogger.i18NLogger.warn_coordinator_AbstractRecord_npe(Integer.toString(type));
+
+ return null;
+ }
catch (final Throwable ex)
{
ex.printStackTrace();
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 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -305,59 +305,48 @@
}
if ((actionStatus == ActionStatus.RUNNING)
- || (actionStatus == ActionStatus.ABORT_ONLY))
- {
- /* If current action is one of my children there's an error */
+ || (actionStatus == ActionStatus.ABORT_ONLY)) {
+ /* If current action is one of my children there's an error */
- BasicAction currentAct = BasicAction.Current();
+ BasicAction currentAct = BasicAction.Current();
- if ((currentAct != null) && (currentAct != this))
- {
- /*
- * Is the current action a child of this action? If so, abort
- * until we get to the current action. This works even in a
- * multi-threaded environment where each thread may have a
- * different notion of current, since Current returns the thread
- * specific current.
- */
+ if ((currentAct != null) && (currentAct != this)) {
+ /*
+ * Is the current action a child of this action? If so, abort
+ * until we get to the current action. This works even in a
+ * multi-threaded environment where each thread may have a
+ * different notion of current, since Current returns the thread
+ * specific current.
+ */
- if (currentAct.isAncestor(get_uid()))
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_1(get_uid());
- }
+ if (currentAct.isAncestor(get_uid())) {
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_1(get_uid());
- while ((currentAct != this) && (currentAct != null))
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_2(currentAct.get_uid());
- }
+ while ((currentAct != this) && (currentAct != null)) {
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_2(currentAct.get_uid());
- currentAct.Abort();
+ currentAct.Abort();
- currentAct = BasicAction.Current();
- }
- }
- }
+ currentAct = BasicAction.Current();
+ }
+ }
+ }
- BasicAction parentAct = parent();
+ BasicAction parentAct = parent();
- /* prevent commit of parents (safety) */
+ /* prevent commit of parents (safety) */
- while (parentAct != null)
- {
- parentAct.preventCommit();
- parentAct = parentAct.parent();
- }
-
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_3(get_uid());
+ while (parentAct != null) {
+ parentAct.preventCommit();
+ parentAct = parentAct.parent();
}
- /* This will also kill any children */
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_3(get_uid());
- Abort();
- }
+ /* This will also kill any children */
+
+ Abort();
+ }
else
{
if (actionStatus == ActionStatus.PREPARED)
@@ -655,14 +644,11 @@
oState = null;
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_5(get_uid(), type());
- }
+ else {
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_5(get_uid(), type());
- restored = false;
- }
+ restored = false;
+ }
return restored;
}
@@ -718,12 +704,9 @@
}
/** If we failed to deactivate then output warning * */
- if (!deactivated)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_5a(get_uid(), type());
- }
- }
+ if (!deactivated) {
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_5a(get_uid(), type());
+ }
}
catch (ObjectStoreException e)
{
@@ -1277,14 +1260,11 @@
{
AbstractRecord record = AbstractRecord.create(record_type);
- if (record == null)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_21(Integer.toString(record_type));
- }
+ if (record == null) {
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_21(Integer.toString(record_type));
- res = false;
- }
+ res = false;
+ }
else
res = (record.restore_state(os, ot) && preparedList.insert(record));
@@ -1358,13 +1338,11 @@
{
res = false;
}
- catch (final NullPointerException ex)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_coordinator_norecordfound(Integer.toString(record_type));
-
- res = false;
- }
+ catch (final NullPointerException ex) {
+ tsLogger.i18NLogger.warn_coordinator_norecordfound(Integer.toString(record_type));
+
+ res = false;
+ }
}
}
@@ -1376,13 +1354,11 @@
tempActionType = os.unpackInt();
tempHeuristicDecision = os.unpackInt();
}
- catch (IOException e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_coordinator_BasicAction_24();
+ catch (IOException e) {
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_24();
- res = false;
- }
+ res = false;
+ }
}
if (res)
@@ -1526,26 +1502,20 @@
// check to see if transaction system is enabled
- if (!TxControl.isEnabled())
- {
- /*
- * Prevent transaction from making forward progress.
- */
-
- actionStatus = ActionStatus.ABORT_ONLY;
-
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_notrunning();
- }
- }
+ if (!TxControl.isEnabled()) {
+ /*
+ * Prevent transaction from making forward progress.
+ */
+
+ actionStatus = ActionStatus.ABORT_ONLY;
+
+ tsLogger.i18NLogger.warn_coordinator_notrunning();
+ }
else
{
- if (actionStatus != ActionStatus.CREATED)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_29(get_uid(), ActionStatus.stringForm(actionStatus));
- }
- }
+ if (actionStatus != ActionStatus.CREATED) {
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_29(get_uid(), ActionStatus.stringForm(actionStatus));
+ }
else
{
actionInitialise(parentAct);
@@ -1556,17 +1526,12 @@
{
actionStatus = ActionStatus.ABORT_ONLY;
- if (parentAct == null)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_30(get_uid());
- }
- }
+ if (parentAct == null) {
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_30(get_uid());
+ }
else
{
- if (tsLogger.arjLoggerI18N.isDebugEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_31(get_uid(), parentAct.get_uid(), Integer.toString(parentAct.status()));
- }
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_31(get_uid(), parentAct.get_uid(), Integer.toString(parentAct.status()));
}
}
@@ -1615,25 +1580,21 @@
/* Check for superfluous invocation */
if ((actionStatus != ActionStatus.RUNNING)
- && (actionStatus != ActionStatus.ABORT_ONLY))
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- {
- switch (actionStatus) {
- case ActionStatus.CREATED:
- tsLogger.i18NLogger.warn_coordinator_BasicAction_33(get_uid());
- break;
- case ActionStatus.COMMITTED:
- tsLogger.i18NLogger.warn_coordinator_BasicAction_34(get_uid());
- break;
- default:
- tsLogger.i18NLogger.warn_coordinator_BasicAction_35(get_uid());
- break;
- }
- }
+ && (actionStatus != ActionStatus.ABORT_ONLY)) {
+ switch (actionStatus) {
+ case ActionStatus.CREATED:
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_33(get_uid());
+ break;
+ case ActionStatus.COMMITTED:
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_34(get_uid());
+ break;
+ default:
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_35(get_uid());
+ break;
+ }
- return actionStatus;
- }
+ return actionStatus;
+ }
/*
* Check we are the current action. Abort parents if not true. Check we
@@ -1661,30 +1622,21 @@
}
else
{
- if (prepare(reportHeuristics) == TwoPhaseOutcome.PREPARE_NOTOK)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_36(get_uid());
+ if (prepare(reportHeuristics) == TwoPhaseOutcome.PREPARE_NOTOK) {
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_36(get_uid());
+
+ if (heuristicDecision != TwoPhaseOutcome.PREPARE_OK) {
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_37(TwoPhaseOutcome.stringForm(heuristicDecision));
}
- if (heuristicDecision != TwoPhaseOutcome.PREPARE_OK)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_37(TwoPhaseOutcome.stringForm(heuristicDecision));
- }
- }
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_38();
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_coordinator_BasicAction_38();
-
- if (!reportHeuristics && TxControl.asyncCommit
- && (parentAction == null))
- {
- AsyncCommit.create(this, false);
- }
- else
- phase2Abort(reportHeuristics); /* first phase failed */
- }
+ if (!reportHeuristics && TxControl.asyncCommit
+ && (parentAction == null)) {
+ AsyncCommit.create(this, false);
+ } else
+ phase2Abort(reportHeuristics); /* first phase failed */
+ }
else
{
if (!reportHeuristics && TxControl.asyncCommit
@@ -1780,25 +1732,21 @@
if ((actionStatus != ActionStatus.RUNNING)
&& (actionStatus != ActionStatus.ABORT_ONLY)
- && (actionStatus != ActionStatus.COMMITTING))
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- {
- switch (actionStatus) {
- case ActionStatus.CREATED:
- tsLogger.i18NLogger.warn_coordinator_BasicAction_39(get_uid());
- break;
- case ActionStatus.ABORTED:
- tsLogger.i18NLogger.warn_coordinator_BasicAction_40(get_uid());
- break;
- default:
- tsLogger.i18NLogger.warn_coordinator_BasicAction_41(get_uid());
- break;
- }
- }
+ && (actionStatus != ActionStatus.COMMITTING)) {
+ switch (actionStatus) {
+ case ActionStatus.CREATED:
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_39(get_uid());
+ break;
+ case ActionStatus.ABORTED:
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_40(get_uid());
+ break;
+ default:
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_41(get_uid());
+ break;
+ }
- return actionStatus;
- }
+ return actionStatus;
+ }
/*
* Check we are the current action. Abort parents if not true. Some
@@ -1984,16 +1932,13 @@
+ get_uid());
}
- if ((pendingList != null) && (pendingList.size() > 0))
- {
- int size = ((pendingList == null) ? 0 : pendingList.size());
+ if ((pendingList != null) && (pendingList.size() > 0)) {
+ int size = ((pendingList == null) ? 0 : pendingList.size());
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_42(get_uid(), Integer.toString(size), pendingList.toString());
- }
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_42(get_uid(), Integer.toString(size), pendingList.toString());
- phase2Abort(reportHeuristics);
- }
+ phase2Abort(reportHeuristics);
+ }
else
{
criticalStart();
@@ -2168,16 +2113,13 @@
/* If we cannot commit - say the prepare failed */
- if (!commitAllowed)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_43(get_uid());
- }
+ if (!commitAllowed) {
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_43(get_uid());
- actionStatus = ActionStatus.PREPARED;
+ actionStatus = ActionStatus.PREPARED;
- return TwoPhaseOutcome.PREPARE_NOTOK;
- }
+ return TwoPhaseOutcome.PREPARE_NOTOK;
+ }
/*
* Make sure the object store is set up for a top-level atomic action.
@@ -2335,11 +2277,9 @@
if (parentAction != null)
parentAction.preventCommit();
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_coordinator_BasicAction_44();
- }
+ else {
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_44();
+ }
}
criticalEnd();
@@ -2433,31 +2373,25 @@
String tn = type();
OutputObjectState state = new OutputObjectState(u, tn);
- if (!save_state(state, ObjectType.ANDPERSISTENT))
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_45(get_uid());
- }
+ if (!save_state(state, ObjectType.ANDPERSISTENT)) {
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_45(get_uid());
- criticalEnd();
+ criticalEnd();
- return TwoPhaseOutcome.PREPARE_NOTOK;
- }
+ return TwoPhaseOutcome.PREPARE_NOTOK;
+ }
if (state.notempty())
{
try
{
- if (!currentStore.write_committed(u, tn, state))
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_46(get_uid());
- }
+ if (!currentStore.write_committed(u, tn, state)) {
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_46(get_uid());
- criticalEnd();
+ criticalEnd();
- return TwoPhaseOutcome.PREPARE_NOTOK;
- }
+ return TwoPhaseOutcome.PREPARE_NOTOK;
+ }
else
savedIntentionList = true;
}
@@ -2492,16 +2426,13 @@
/* Are we forced to abort? */
- if (actionStatus == ActionStatus.ABORT_ONLY)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_43(get_uid());
- }
+ if (actionStatus == ActionStatus.ABORT_ONLY) {
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_43(get_uid());
- Abort();
+ Abort();
- return;
- }
+ return;
+ }
actionStatus = ActionStatus.COMMITTING;
@@ -2578,53 +2509,44 @@
else
actionStatus = ActionStatus.ABORTED;
}
- else
- {
- /*
- * Heuristic decision!!
- */
-
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_47(get_uid(), TwoPhaseOutcome.stringForm(p));
+ else {
+ /*
+ * Heuristic decision!!
+ */
+
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_47(get_uid(), TwoPhaseOutcome.stringForm(p));
+
+ if (reportHeuristics) {
+ updateHeuristic(p, true);
+
+ if (!heuristicList.insert(recordBeingHandled))
+ recordBeingHandled = null;
+ else {
+ if (!stateToSave)
+ stateToSave = recordBeingHandled.doSave();
}
-
- if (reportHeuristics)
- {
- updateHeuristic(p, true);
-
- if (!heuristicList.insert(recordBeingHandled))
- recordBeingHandled = null;
- else
- {
- if (!stateToSave)
- stateToSave = recordBeingHandled.doSave();
- }
- }
-
- if (heuristicDecision == TwoPhaseOutcome.HEURISTIC_ROLLBACK)
- {
- /*
- * Signal that the action outcome is the same as the
- * heuristic decision.
- */
-
- heuristicDecision = TwoPhaseOutcome.PREPARE_OK; // means no
- // heuristic
- // was
- // raised.
-
- actionStatus = ActionStatus.ABORTED;
- }
- else if (heuristicDecision == TwoPhaseOutcome.HEURISTIC_COMMIT)
- {
- heuristicDecision = TwoPhaseOutcome.PREPARE_OK;
- actionStatus = ActionStatus.COMMITTED;
- }
- else
- actionStatus = ActionStatus.H_HAZARD; // can't really say
- // (could have
- // aborted)
- }
+ }
+
+ if (heuristicDecision == TwoPhaseOutcome.HEURISTIC_ROLLBACK) {
+ /*
+ * Signal that the action outcome is the same as the
+ * heuristic decision.
+ */
+
+ heuristicDecision = TwoPhaseOutcome.PREPARE_OK; // means no
+ // heuristic
+ // was
+ // raised.
+
+ actionStatus = ActionStatus.ABORTED;
+ } else if (heuristicDecision == TwoPhaseOutcome.HEURISTIC_COMMIT) {
+ heuristicDecision = TwoPhaseOutcome.PREPARE_OK;
+ actionStatus = ActionStatus.COMMITTED;
+ } else
+ actionStatus = ActionStatus.H_HAZARD; // can't really say
+ // (could have
+ // aborted)
+ }
}
if (actionType == ActionType.TOP_LEVEL)
@@ -2633,10 +2555,7 @@
{
if (store() == null)
{
- if (tsLogger.arjLoggerI18N.isFatalEnabled())
- {
- tsLogger.i18NLogger.fatal_coordinator_BasicAction_48();
- }
+ tsLogger.i18NLogger.fatal_coordinator_BasicAction_48();
throw new com.arjuna.ats.arjuna.exceptions.FatalError(
tsLogger.i18NLogger.get_coordinator_BasicAction_69()
@@ -2843,37 +2762,34 @@
if (actionType == ActionType.NESTED)
{
if ((preparedList.size() > 0)
- && (p == TwoPhaseOutcome.ONE_PHASE_ERROR))
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_49(get_uid());
- }
+ && (p == TwoPhaseOutcome.ONE_PHASE_ERROR)) {
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_49(get_uid());
- /*
- * Force parent to rollback. If this is not the
- * desired result then we may need to check some
- * environment variable (either here or in the
- * OTS) and act accordingly. If we check in the
- * OTS then we need to return something other
- * than PREPARE_NOTOK.
- */
+ /*
+ * Force parent to rollback. If this is not the
+ * desired result then we may need to check some
+ * environment variable (either here or in the
+ * OTS) and act accordingly. If we check in the
+ * OTS then we need to return something other
+ * than PREPARE_NOTOK.
+ */
- /*
- * For the OTS we must merge those records told
- * to commit with the parent, as the rollback
- * invocation must come from that since they
- * have already been told this transaction has
- * committed!
- *
- * However, since we may be multi-threaded
- * (asynchronous prepare) we don't do the
- * merging yet. Wait until all threads have
- * terminated and then do it.
- *
- * Therefore, can't force parent to rollback
- * state at present, or merge will fail.
- */
- }
+ /*
+ * For the OTS we must merge those records told
+ * to commit with the parent, as the rollback
+ * invocation must come from that since they
+ * have already been told this transaction has
+ * committed!
+ *
+ * However, since we may be multi-threaded
+ * (asynchronous prepare) we don't do the
+ * merging yet. Wait until all threads have
+ * terminated and then do it.
+ *
+ * Therefore, can't force parent to rollback
+ * state at present, or merge will fail.
+ */
+ }
}
/*
@@ -2889,55 +2805,49 @@
return p;
}
- else
- {
- /*
- * Heuristic decision!!
- */
+ else {
+ /*
+ * Heuristic decision!!
+ */
- /*
- * Only report if request to do so.
- */
+ /*
+ * Only report if request to do so.
+ */
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_50(get_uid(), TwoPhaseOutcome.stringForm(p));
- }
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_50(get_uid(), TwoPhaseOutcome.stringForm(p));
- if (reportHeuristics)
- updateHeuristic(p, false);
+ if (reportHeuristics)
+ updateHeuristic(p, false);
- /*
- * Don't add to the prepared list. We process heuristics
- * separately during phase 2. The processing of records
- * will not be in the same order as during phase 1, but
- * does this matter for heuristic decisions? If so, then
- * we need to modify RecordList so that records can
- * appear on multiple lists at the same time.
- */
+ /*
+ * Don't add to the prepared list. We process heuristics
+ * separately during phase 2. The processing of records
+ * will not be in the same order as during phase 1, but
+ * does this matter for heuristic decisions? If so, then
+ * we need to modify RecordList so that records can
+ * appear on multiple lists at the same time.
+ */
- record = insertRecord(heuristicList, record);
+ record = insertRecord(heuristicList, record);
- /*
- * If we have had a heuristic decision, then attempt to
- * make the action outcome the same. If we have a
- * conflict, then we will abort.
- */
+ /*
+ * If we have had a heuristic decision, then attempt to
+ * make the action outcome the same. If we have a
+ * conflict, then we will abort.
+ */
- if (heuristicDecision != TwoPhaseOutcome.HEURISTIC_COMMIT)
- {
- actionStatus = ActionStatus.PREPARED;
+ if (heuristicDecision != TwoPhaseOutcome.HEURISTIC_COMMIT) {
+ actionStatus = ActionStatus.PREPARED;
- return TwoPhaseOutcome.PREPARE_NOTOK;
- }
- else
- {
- /*
- * Heuristic commit, which is ok since we want to
- * commit anyway! So, ignore it (but remember the
- * resource so we can tell it to forget later.)
- */
- }
- }
+ return TwoPhaseOutcome.PREPARE_NOTOK;
+ } else {
+ /*
+ * Heuristic commit, which is ok since we want to
+ * commit anyway! So, ignore it (but remember the
+ * resource so we can tell it to forget later.)
+ */
+ }
+ }
}
}
}
@@ -3183,36 +3093,28 @@
if ((reportHeuristics)
&& ((ok == TwoPhaseOutcome.HEURISTIC_ROLLBACK)
|| (ok == TwoPhaseOutcome.HEURISTIC_COMMIT)
- || (ok == TwoPhaseOutcome.HEURISTIC_MIXED) || (ok == TwoPhaseOutcome.HEURISTIC_HAZARD)))
+ || (ok == TwoPhaseOutcome.HEURISTIC_MIXED) || (ok == TwoPhaseOutcome.HEURISTIC_HAZARD))) {
+ if (actionType == ActionType.TOP_LEVEL)
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_52(get_uid(), TwoPhaseOutcome.stringForm(ok));
+ else
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_53(get_uid(), TwoPhaseOutcome.stringForm(ok));
+
+ updateHeuristic(ok, false);
+ heuristicList.insert(recordBeingHandled);
+ }
+ else
{
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- {
+ if (ok != TwoPhaseOutcome.FINISH_OK) {
if (actionType == ActionType.TOP_LEVEL)
- tsLogger.i18NLogger.warn_coordinator_BasicAction_52(get_uid(), TwoPhaseOutcome.stringForm(ok));
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_54(get_uid(),
+ TwoPhaseOutcome.stringForm(ok),
+ RecordType.typeToClass(recordBeingHandled.typeIs()).getCanonicalName());
else
- tsLogger.i18NLogger.warn_coordinator_BasicAction_53(get_uid(), TwoPhaseOutcome.stringForm(ok));
- }
-
- updateHeuristic(ok, false);
- heuristicList.insert(recordBeingHandled);
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_55(get_uid(),
+ TwoPhaseOutcome.stringForm(ok),
+ RecordType.typeToClass(recordBeingHandled.typeIs()).getCanonicalName());
+ }
}
- else
- {
- if (ok != TwoPhaseOutcome.FINISH_OK)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- {
- if (actionType == ActionType.TOP_LEVEL)
- tsLogger.i18NLogger.warn_coordinator_BasicAction_54(get_uid(),
- TwoPhaseOutcome.stringForm(ok),
- RecordType.typeToClass(recordBeingHandled.typeIs()).getCanonicalName());
- else
- tsLogger.i18NLogger.warn_coordinator_BasicAction_55(get_uid(),
- TwoPhaseOutcome.stringForm(ok),
- RecordType.typeToClass(recordBeingHandled.typeIs()).getCanonicalName());
- }
- }
- }
}
/*
@@ -3482,29 +3384,24 @@
/* Ensure I am the currently active action */
- if ((currentAct != null) && (currentAct != this))
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_56(currentAct.get_uid(), get_uid());
- }
+ if ((currentAct != null) && (currentAct != this)) {
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_56(currentAct.get_uid(), get_uid());
- isCurrent = false;
+ isCurrent = false;
- if (currentAct.isAncestor(get_uid()))
- {
- /* current action is one of my children */
+ if (currentAct.isAncestor(get_uid())) {
+ /* current action is one of my children */
- BasicAction parentAct = parent();
+ BasicAction parentAct = parent();
- /* prevent commit of my parents (ensures safety) */
+ /* prevent commit of my parents (ensures safety) */
- while (parentAct != null)
- {
- parentAct.preventCommit();
- parentAct = parentAct.parent();
- }
- }
- }
+ while (parentAct != null) {
+ parentAct.preventCommit();
+ parentAct = parentAct.parent();
+ }
+ }
+ }
currentAct = null;
}
@@ -3524,28 +3421,23 @@
if ((_childThreads != null) && (_childThreads.size() > 0))
{
if ((_childThreads.size() != 1)
- || ((_childThreads.size() == 1) && (!_childThreads.contains(Thread.currentThread()))))
- {
- /*
- * More than one thread or the one thread is not the current
- * thread
- */
+ || ((_childThreads.size() == 1) && (!_childThreads.contains(Thread.currentThread())))) {
+ /*
+ * More than one thread or the one thread is not the current
+ * thread
+ */
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- {
- if (isCommit) {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_57(get_uid());
- }
- else {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_58(get_uid());
- }
- }
+ if (isCommit) {
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_57(get_uid());
+ } else {
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_58(get_uid());
+ }
- if (_checkedAction != null)
- _checkedAction.check(isCommit, get_uid(), _childThreads);
+ if (_checkedAction != null)
+ _checkedAction.check(isCommit, get_uid(), _childThreads);
- removeAllChildThreads();
- }
+ removeAllChildThreads();
+ }
}
/* Ensure I have no child actions */
@@ -3571,40 +3463,29 @@
{
child = (BasicAction) iter.nextElement();
- if (child.status() != ActionStatus.ABORTED)
- {
- if (printError)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- {
- if (isCommit) {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_59(get_uid());
- }
- else {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_60(get_uid());
- }
- }
+ if (child.status() != ActionStatus.ABORTED) {
+ if (printError) {
+ if (isCommit) {
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_59(get_uid());
+ } else {
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_60(get_uid());
+ }
- printError = false;
- }
-
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_61(child.get_uid());
+ printError = false;
}
- child.Abort();
- child = null;
- }
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_61(child.get_uid());
+
+ child.Abort();
+ child = null;
+ }
}
iter = null;
- if (isCommit)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_BasicAction_62(((child != null ? child.get_uid().toString() : "null")));
- }
- }
+ if (isCommit) {
+ tsLogger.i18NLogger.warn_coordinator_BasicAction_62(((child != null ? child.get_uid().toString() : "null")));
+ }
}
return problem;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/CheckedAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/CheckedAction.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/CheckedAction.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -68,13 +68,10 @@
public void check (boolean isCommit, Uid actUid, Hashtable list)
{
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- {
- if (isCommit)
- tsLogger.i18NLogger.warn_coordinator_CheckedAction_1(actUid, Integer.toString(list.size()));
- else
- tsLogger.i18NLogger.warn_coordinator_CheckedAction_2(actUid, Integer.toString(list.size()));
- }
+ if (isCommit)
+ tsLogger.i18NLogger.warn_coordinator_CheckedAction_1(actUid, Integer.toString(list.size()));
+ else
+ tsLogger.i18NLogger.warn_coordinator_CheckedAction_2(actUid, Integer.toString(list.size()));
}
}
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 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -161,12 +161,12 @@
do {
final ReaperElement reaperElement;
- synchronized (this) {
+ synchronized(this) {
final long now = System.currentTimeMillis();
final long next = nextDynamicCheckTime.get();
if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("TransactionReaper::check - comparing "+Long.toString(next));
+ tsLogger.arjLogger.debug("TransactionReaper::check - comparing " + Long.toString(next));
}
if (now < next) {
@@ -176,19 +176,17 @@
reaperElement = _reaperElements.getFirst();
// TODO close window where first can change - maybe record nextDynamicCheckTime before probing first,
// then use compareAndSet? Although something will need to check before sleeping anyhow...
- if(reaperElement == null) {
+ if (reaperElement == null) {
nextDynamicCheckTime.set(Long.MAX_VALUE);
return;
} else {
- if(reaperElement.getAbsoluteTimeout() > now) {
+ if (reaperElement.getAbsoluteTimeout() > now) {
return; // nothing to do yet.
}
}
}
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_TransactionReaper_18(reaperElement._control.get_uid(), reaperElement.statusName());
- }
+ tsLogger.i18NLogger.warn_coordinator_TransactionReaper_18(reaperElement._control.get_uid(), reaperElement.statusName());
// if we have to synchronize on multiple objects we always
// do so in a fixed order ReaperElement before Reaper and
@@ -196,7 +194,7 @@
// ensure we don't deadlock. We never sychronize on the
// reaper and the cancel queue at the same time.
- synchronized (reaperElement) {
+ synchronized(reaperElement) {
switch (reaperElement._status) {
case ReaperElement.RUN: {
// this tx has just timed out. remove it from the
@@ -217,7 +215,7 @@
// thread to process and then make sure a worker
// thread is awake
- synchronized (_workQueue) {
+ synchronized(_workQueue) {
_workQueue.add(reaperElement);
_workQueue.notifyAll();
}
@@ -259,7 +257,7 @@
// log that we interrupted cancel()
if (tsLogger.arjLogger.isDebugEnabled()) {
- tsLogger.arjLogger.debug("TransactionReaper::check interrupting cancel in progress for "+reaperElement._control.get_uid());
+ tsLogger.arjLogger.debug("TransactionReaper::check interrupting cancel in progress for " + reaperElement._control.get_uid());
}
}
break;
@@ -273,7 +271,7 @@
reaperElement._status = ReaperElement.ZOMBIE;
- synchronized (this) {
+ synchronized(this) {
_zombieCount++;
if (tsLogger.arjLogger.isDebugEnabled()) {
@@ -283,9 +281,7 @@
if (_zombieCount == _zombieMax) {
// log zombie overflow error call()
- if (tsLogger.arjLoggerI18N.isErrorEnabled()) {
- tsLogger.i18NLogger.error_coordinator_TransactionReaper_5(Integer.toString(_zombieCount));
- }
+ tsLogger.i18NLogger.error_coordinator_TransactionReaper_5(Integer.toString(_zombieCount));
}
}
@@ -296,10 +292,8 @@
// log a failed cancel()
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_TransactionReaper_6(reaperElement._worker.toString(),
- reaperElement._control.get_uid());
- }
+ tsLogger.i18NLogger.warn_coordinator_TransactionReaper_6(reaperElement._worker.toString(),
+ reaperElement._control.get_uid());
// ok, since the worker was wedged we need to
// remove the entry from the timeouts and
@@ -314,25 +308,19 @@
// log a successful preventCommit()
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_TransactionReaper_10(reaperElement._control.get_uid());
- }
+ tsLogger.i18NLogger.warn_coordinator_TransactionReaper_10(reaperElement._control.get_uid());
notifyListeners(reaperElement._control, false);
} else {
// log a failed preventCommit()
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_TransactionReaper_11(reaperElement._control.get_uid());
- }
+ tsLogger.i18NLogger.warn_coordinator_TransactionReaper_11(reaperElement._control.get_uid());
}
}
catch (Exception e1) {
// log an exception under preventCommit()
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_TransactionReaper_12(reaperElement._control.get_uid(), e1);
- }
+ tsLogger.i18NLogger.warn_coordinator_TransactionReaper_12(reaperElement._control.get_uid(), e1);
}
}
break;
@@ -452,14 +440,12 @@
ReaperWorkerThread worker = (ReaperWorkerThread) Thread.currentThread();
worker.shutdown();
- synchronized (this) {
+ synchronized(this) {
_zombieCount--;
}
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_TransactionReaper_13(Thread.currentThread().toString(),
- e._control.get_uid(), Integer.toString(_zombieCount));
- }
+ tsLogger.i18NLogger.warn_coordinator_TransactionReaper_13(Thread.currentThread().toString(),
+ e._control.get_uid(), Integer.toString(_zombieCount));
// this gets us out of the for(;;) loop and
// the shutdown call above makes sure we exit
@@ -488,47 +474,35 @@
// the transactions queue and mark TX as rollback only
if (cancelled) {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_TransactionReaper_7(Thread.currentThread().toString(),
- e._control.get_uid());
- }
+ tsLogger.i18NLogger.warn_coordinator_TransactionReaper_7(Thread.currentThread().toString(),
+ e._control.get_uid());
} else if (e._control.running()) {
if (exception != null) {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_TransactionReaper_9(Thread.currentThread().toString(), e._control.get_uid(), exception);
- }
+ tsLogger.i18NLogger.warn_coordinator_TransactionReaper_9(Thread.currentThread().toString(), e._control.get_uid(), exception);
} else {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_TransactionReaper_8(Thread.currentThread().toString(),
- e._control.get_uid());
- }
+ tsLogger.i18NLogger.warn_coordinator_TransactionReaper_8(Thread.currentThread().toString(),
+ e._control.get_uid());
}
try {
if (e._control.preventCommit()) {
// log a successful preventCommit()
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_TransactionReaper_14(Thread.currentThread().toString(),
- e._control.get_uid());
- }
+ tsLogger.i18NLogger.warn_coordinator_TransactionReaper_14(Thread.currentThread().toString(),
+ e._control.get_uid());
notifyListeners(e._control, false);
} else {
// log a failed preventCommit()
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_TransactionReaper_15(Thread.currentThread().toString(),
- e._control.get_uid());
- }
+ tsLogger.i18NLogger.warn_coordinator_TransactionReaper_15(Thread.currentThread().toString(),
+ e._control.get_uid());
}
}
catch (Exception e1) {
// log an exception under preventCommit()
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_TransactionReaper_16(Thread.currentThread().toString(), e._control.get_uid(), e1);
- }
+ tsLogger.i18NLogger.warn_coordinator_TransactionReaper_16(Thread.currentThread().toString(), e._control.get_uid(), e1);
}
}
@@ -887,9 +861,7 @@
if (mode.compareTo(TransactionReaper.NORMAL) == 0) {
TransactionReaper._dynamic = false;
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_TransactionReaper_19();
- }
+ tsLogger.i18NLogger.warn_coordinator_TransactionReaper_19();
}
long checkPeriod = Long.MAX_VALUE;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -292,14 +292,11 @@
public static void setXANodeName(byte[] name)
{
- if (name.length > NODE_NAME_SIZE)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_toolong();
- }
-
- throw new IllegalArgumentException();
- }
+ if (name.length > NODE_NAME_SIZE) {
+ tsLogger.i18NLogger.warn_coordinator_toolong();
+
+ throw new IllegalArgumentException();
+ }
xaNodeName = name;
}
@@ -404,51 +401,42 @@
{
xaNodeName = env.getBytes();
}
- else
- {
- /*
- * In the past we used a Uid as the default node name. However, this is too
- * big for the way in which we use it within Xids now that we also support
- * ipv6. Hence the need to limit the size of a node name to 10 bytes.
- */
-
- String nodeName = DEFAULT_NODE_NAME+Utility.getpid();
+ else {
+ /*
+ * In the past we used a Uid as the default node name. However, this is too
+ * big for the way in which we use it within Xids now that we also support
+ * ipv6. Hence the need to limit the size of a node name to 10 bytes.
+ */
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_TxControl_1(nodeName);
- }
+ String nodeName = DEFAULT_NODE_NAME + Utility.getpid();
- xaNodeName = nodeName.getBytes();
+ tsLogger.i18NLogger.warn_coordinator_TxControl_1(nodeName);
- writeNodeName = true;
- }
+ xaNodeName = nodeName.getBytes();
- if (xaNodeName.length > NODE_NAME_SIZE)
- {
- String nodeName = DEFAULT_NODE_NAME+Utility.getpid();
+ writeNodeName = true;
+ }
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_TxControl_2(nodeName);
- }
+ if (xaNodeName.length > NODE_NAME_SIZE) {
+ String nodeName = DEFAULT_NODE_NAME + Utility.getpid();
- xaNodeName = nodeName.getBytes();
+ tsLogger.i18NLogger.warn_coordinator_TxControl_2(nodeName);
- writeNodeName = true;
- }
+ xaNodeName = nodeName.getBytes();
- if ((env != null) && (env.indexOf('-') != -1))
- {
- String nodeName = DEFAULT_NODE_NAME+Utility.getpid();
+ writeNodeName = true;
+ }
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_coordinator_TxControl_3(nodeName);
- }
+ if ((env != null) && (env.indexOf('-') != -1)) {
+ String nodeName = DEFAULT_NODE_NAME + Utility.getpid();
- xaNodeName = nodeName.getBytes();
+ tsLogger.i18NLogger.warn_coordinator_TxControl_3(nodeName);
- writeNodeName = true;
- }
+ xaNodeName = nodeName.getBytes();
+ writeNodeName = true;
+ }
+
if (writeNodeName)
{
arjPropertyManager.getCoreEnvironmentBean().setNodeIdentifier( new String(xaNodeName) );
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/tsLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/tsLogger.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/logging/tsLogger.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -37,13 +37,11 @@
public class tsLogger
{
public static LogNoi18n arjLogger;
- public static Logi18n arjLoggerI18N;
public static arjunaI18NLogger i18NLogger;
public static void initialize(LogNoi18n noi18n, Logi18n i18n)
{
arjLogger = noi18n;
- arjLoggerI18N = i18n;
i18NLogger = new arjunaI18NLoggerImpl(Logger.getLogger("com.arjuna.ats.arjuna"));
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/objectstore/ObjectStoreType.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/objectstore/ObjectStoreType.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/objectstore/ObjectStoreType.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -34,6 +34,7 @@
import java.io.*;
import com.arjuna.ats.arjuna.common.arjPropertyManager;
+import com.arjuna.ats.arjuna.exceptions.FatalError;
import com.arjuna.ats.arjuna.logging.tsLogger;
import com.arjuna.ats.arjuna.objectstore.type.ObjectStoreTypeManager;
import com.arjuna.ats.internal.arjuna.objectstore.ActionStore;
@@ -185,17 +186,15 @@
return HASHED_ACTION;
if (c.equals(CacheStore.class))
return CACHED;
-
+
int type = ObjectStoreTypeManager.manager().getType(c);
if (type >= 0)
return type;
-
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_objectstore_ObjectStoreType_1(c.getCanonicalName());
- }
- throw new com.arjuna.ats.arjuna.exceptions.FatalError(
+ tsLogger.i18NLogger.warn_objectstore_ObjectStoreType_1(c.getCanonicalName());
+
+ throw new FatalError(
tsLogger.i18NLogger.get_objectstore_ObjectStoreType_2()
+ c);
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/ActionStatusService.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/ActionStatusService.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/ActionStatusService.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -153,23 +153,16 @@
out.println( strStatus );
out.flush();
- if (tsLogger.arjLoggerI18N.isInfoEnabled())
- {
- tsLogger.i18NLogger.info_recovery_ActionStatusService_1(transactionType, strUid, strStatus);
- }
+ tsLogger.i18NLogger.info_recovery_ActionStatusService_1(transactionType, strUid, strStatus);
+
}
}
}
- catch ( IOException ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_recovery_ActionStatusService_7();
+ catch ( IOException ex ) {
+ tsLogger.i18NLogger.warn_recovery_ActionStatusService_7();
}
- catch ( Exception ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_ActionStatusService_2(ex);
- }
+ catch ( Exception ex ) {
+ tsLogger.i18NLogger.warn_recovery_ActionStatusService_2(ex);
}
}
@@ -205,12 +198,9 @@
action_status = getObjectStoreStatus( tranUid, transactionType );
}
}
- catch ( Exception ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_ActionStatusService_3(ex);
- }
- }
+ catch ( Exception ex ) {
+ tsLogger.i18NLogger.warn_recovery_ActionStatusService_3(ex);
+ }
return action_status;
}
@@ -245,12 +235,9 @@
action_status = getOsStatus( tranUid );
}
}
- catch ( Exception ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+ catch ( Exception ex ) {
tsLogger.i18NLogger.warn_recovery_ActionStatusService_3(ex);
}
- }
return action_status;
}
@@ -315,45 +302,27 @@
// add to vector
matchingUidVector.addElement( tranUid );
matchingUidTypeVector.addElement( theTypeName );
- if (tsLogger.arjLoggerI18N.isInfoEnabled())
- {
- tsLogger.i18NLogger.info_recovery_ActionStatusService_4(tranUid);
- }
+ tsLogger.i18NLogger.info_recovery_ActionStatusService_4(tranUid);
}
}
}
}
- catch ( Exception ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_ActionStatusService_5(tranUid, ex);
- }
+ catch ( Exception ex ) {
+ tsLogger.i18NLogger.warn_recovery_ActionStatusService_5(tranUid, ex);
}
}
}
}
- catch ( IOException ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- {
- tsLogger.i18NLogger.warn_recovery_ActionStatusService_5(tranUid, ex);
- }
+ catch ( IOException ex ) {
+ tsLogger.i18NLogger.warn_recovery_ActionStatusService_5(tranUid, ex);
}
- catch ( Exception ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- {
- tsLogger.i18NLogger.warn_recovery_ActionStatusService_5(tranUid, ex);
- }
+ catch ( Exception ex ) {
+ tsLogger.i18NLogger.warn_recovery_ActionStatusService_5(tranUid, ex);
}
}
}
- catch ( Exception ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- {
- tsLogger.i18NLogger.warn_recovery_ActionStatusService_5(tranUid, ex);
- }
+ catch ( Exception ex ) {
+ tsLogger.i18NLogger.warn_recovery_ActionStatusService_5(tranUid, ex);
}
int uidVectorSize = matchingUidVector.size();
@@ -421,12 +390,9 @@
break;
}
}
- catch ( Exception ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+ catch ( Exception ex ) {
tsLogger.i18NLogger.warn_recovery_ActionStatusService_6(ex);
}
- }
return action_status;
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoverAtomicAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoverAtomicAction.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoverAtomicAction.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -84,12 +84,9 @@
{
super.phase2Abort( _reportHeuristics ) ;
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_RecoverAtomicAction_2(ActionStatus.stringForm(_theStatus));
- }
- }
+ else {
+ tsLogger.i18NLogger.warn_recovery_RecoverAtomicAction_2(ActionStatus.stringForm(_theStatus));
+ }
if (tsLogger.arjLogger.isDebugEnabled()) {
tsLogger.arjLogger.debug("RecoverAtomicAction.replayPhase2( "+get_uid()+" ) finished");
@@ -108,9 +105,7 @@
scanner.moveEntry(get_uid());
}
catch (final Exception ex) {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_RecoverAtomicAction_5(get_uid());
- }
+ tsLogger.i18NLogger.warn_recovery_RecoverAtomicAction_5(get_uid());
}
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoveryManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoveryManager.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoveryManager.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -376,10 +376,7 @@
{
Socket socket = new Socket(getRecoveryManagerHost(), getRecoveryManagerPort());
- if (tsLogger.arjLoggerI18N.isInfoEnabled())
- {
- tsLogger.i18NLogger.info_recovery_RecoveryManager_4(socket.getInetAddress().getHostAddress(), Integer.toString(socket.getLocalPort()));
- }
+ tsLogger.i18NLogger.info_recovery_RecoveryManager_4(socket.getInetAddress().getHostAddress(), Integer.toString(socket.getLocalPort()));
return socket;
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusConnectionManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusConnectionManager.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusConnectionManager.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -121,11 +121,8 @@
{
status = ass.getTransactionStatus(transactionType, tranUid.stringForm());
}
- catch ( Exception ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_TransactionStatusConnectionManager_1(ex);
- }
+ catch ( Exception ex ) {
+ tsLogger.i18NLogger.warn_recovery_TransactionStatusConnectionManager_1(ex);
}
}
@@ -191,12 +188,9 @@
{
tsmis = _objStore.allObjUids( _typeName, uids ) ;
}
- catch ( ObjectStoreException ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_TransactionStatusConnectionManager_2(ex);
- }
- }
+ catch ( ObjectStoreException ex ) {
+ tsLogger.i18NLogger.warn_recovery_TransactionStatusConnectionManager_2(ex);
+ }
// cycle through each item, and update tsmTable with any
// new TransactionStatusManagerItems
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusManager.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusManager.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -34,6 +34,7 @@
import java.io.* ;
import java.net.* ;
+import com.arjuna.ats.arjuna.exceptions.FatalError;
import com.arjuna.ats.arjuna.utils.Utility ;
import com.arjuna.ats.internal.arjuna.recovery.Listener ;
import com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem ;
@@ -97,11 +98,8 @@
_listener = new Listener( serverSocket, service );
_listener.setDaemon(true);
- if (tsLogger.arjLoggerI18N.isInfoEnabled())
- {
- tsLogger.i18NLogger.info_recovery_TransactionStatusManager_1(service.getClass().getName(),
+ tsLogger.i18NLogger.info_recovery_TransactionStatusManager_1(service.getClass().getName(),
Integer.toString(serverSocket.getLocalPort()));
- }
_listener.start() ;
}
@@ -148,37 +146,22 @@
TransactionStatusManagerItem.createAndSave(socketServer.getInetAddress().getHostAddress(), socketServer.getLocalPort() ) ;
- if (tsLogger.arjLoggerI18N.isInfoEnabled())
- {
tsLogger.i18NLogger.info_recovery_TransactionStatusManager_3(Integer.toString(socketServer.getLocalPort()),
socketServer.getInetAddress().getHostAddress(), serviceName);
- }
}
- catch ( ClassNotFoundException ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+ catch ( ClassNotFoundException ex ) {
tsLogger.i18NLogger.warn_recovery_TransactionStatusManager_4(serviceName);
}
- }
- catch ( InstantiationException ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+ catch ( InstantiationException ex ) {
tsLogger.i18NLogger.warn_recovery_TransactionStatusManager_5(serviceName);
}
- }
- catch ( IllegalAccessException ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+ catch ( IllegalAccessException ex ) {
tsLogger.i18NLogger.warn_recovery_TransactionStatusManager_6(serviceName);
}
- }
- catch ( IOException ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+ catch ( IOException ex ) {
tsLogger.i18NLogger.warn_recovery_TransactionStatusManager_14(getListenerHostName(), Integer.toString(getListenerPort(-1)));
- }
- throw new com.arjuna.ats.arjuna.exceptions.FatalError(tsLogger.i18NLogger.get_recovery_TransactionStatusManager_9(), ex);
+ throw new FatalError(tsLogger.i18NLogger.get_recovery_TransactionStatusManager_9(), ex);
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/StateManagerWrapper.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/StateManagerWrapper.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/StateManagerWrapper.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -23,16 +23,14 @@
public StateManagerWrapper(ObjectStore os, Uid uid, String type) {
super(uid);
- try {
-
- unpackHeader(os.read_committed(uid, type));
- } catch (IOException e) {
- if (tsLogger.arjLoggerI18N.isInfoEnabled())
- tsLogger.i18NLogger.info_osb_StateManagerWrapperFail(e);
- } catch (ObjectStoreException e) {
- if (tsLogger.arjLoggerI18N.isInfoEnabled())
- tsLogger.i18NLogger.info_osb_StateManagerWrapperFail(e);
- }
+ try {
+
+ unpackHeader(os.read_committed(uid, type));
+ } catch (IOException e) {
+ tsLogger.i18NLogger.info_osb_StateManagerWrapperFail(e);
+ } catch (ObjectStoreException e) {
+ tsLogger.i18NLogger.info_osb_StateManagerWrapperFail(e);
+ }
}
public String getCreationTime()
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/UidWrapper.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/UidWrapper.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/mbean/UidWrapper.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -122,8 +122,7 @@
Constructor<OSEntryBean> constructor = cl.getConstructor(UidWrapper.class);
mbean = constructor.newInstance(this);
} catch (Exception e) { // ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, InstantiationException
- if (tsLogger.arjLoggerI18N.isInfoEnabled())
- tsLogger.i18NLogger.info_osb_MBeanCtorFail(e);
+ tsLogger.i18NLogger.info_osb_MBeanCtorFail(e);
mbean = new OSEntryBean(this);
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/util/JMXServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/util/JMXServer.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/osb/util/JMXServer.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -114,16 +114,13 @@
ObjectInstance oi = null;
try {
- if (tsLogger.arjLoggerI18N.isInfoEnabled())
- tsLogger.i18NLogger.info_tools_osb_util_JMXServer_m_1(name);
+ tsLogger.i18NLogger.info_tools_osb_util_JMXServer_m_1(name);
oi = getServer().registerMBean(bean, new ObjectName(name));
} catch (InstanceAlreadyExistsException e) {
- if (tsLogger.arjLoggerI18N.isInfoEnabled())
- tsLogger.i18NLogger.info_tools_osb_util_JMXServer_m_2(name);
+ tsLogger.i18NLogger.info_tools_osb_util_JMXServer_m_2(name);
} catch (javax.management.JMException e) {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_tools_osb_util_JMXServer_m_3(name, e);
- }
+ tsLogger.i18NLogger.warn_tools_osb_util_JMXServer_m_3(name, e);
+ }
return oi;
}
@@ -134,16 +131,13 @@
getServer().unregisterMBean(new ObjectName(name));
return true;
} catch (MalformedObjectNameException e) {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_tools_osb_util_JMXServer_m_5(name, e);
- } catch (InstanceNotFoundException e) {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_tools_osb_util_JMXServer_m_5(name, e);
- } catch (MBeanRegistrationException e) {
- // can't happen - none of our beans implement the MBeanRegistration interface
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_tools_osb_util_JMXServer_m_6(name, e);
- }
+ tsLogger.i18NLogger.warn_tools_osb_util_JMXServer_m_5(name, e);
+ } catch (InstanceNotFoundException e) {
+ tsLogger.i18NLogger.warn_tools_osb_util_JMXServer_m_5(name, e);
+ } catch (MBeanRegistrationException e) {
+ // can't happen - none of our beans implement the MBeanRegistration interface
+ tsLogger.i18NLogger.warn_tools_osb_util_JMXServer_m_6(name, e);
+ }
return false;
}
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 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/FileLock.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -306,12 +306,9 @@
else
return false;
}
- catch (IOException e)
- {
+ catch (IOException e) {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_utils_FileLock_4(_lockFile.getName());
- }
+ tsLogger.i18NLogger.warn_utils_FileLock_4(_lockFile.getName());
return false;
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/Utility.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/Utility.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/Utility.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -202,12 +202,10 @@
{
addr = InetAddress.getLocalHost();
}
- catch (final UnknownHostException uhe)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_utils_Utility_2();
+ catch (final UnknownHostException uhe) {
+ tsLogger.i18NLogger.warn_utils_Utility_2();
- addr = InetAddress.getByName(null);
+ addr = InetAddress.getByName(null);
}
if (addr instanceof Inet6Address)
@@ -349,10 +347,8 @@
processHandle = (Process) c.newInstance();
}
- catch (final Exception e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_utils_Utility_1(e);
+ catch (final Exception e) {
+ tsLogger.i18NLogger.warn_utils_Utility_1(e);
}
}
}
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 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/LogWriteStateManager.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -108,13 +108,11 @@
return true;
}
- if (super.status() == ObjectStatus.PASSIVE)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_StateManager_10();
+ if (super.status() == ObjectStatus.PASSIVE) {
+ tsLogger.i18NLogger.warn_StateManager_10();
- activate();
- }
+ activate();
+ }
/*
* Need not have gone through active if new object.
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/TxLogWritePersistenceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/TxLogWritePersistenceRecord.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/TxLogWritePersistenceRecord.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -89,12 +89,9 @@
{
result = store.commit_state(order(), super.getTypeOfObject());
- if (!result)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+ if (!result) {
tsLogger.i18NLogger.warn_PersistenceRecord_2(order());
}
- }
}
else
{
@@ -198,18 +195,14 @@
result = TwoPhaseOutcome.PREPARE_OK;
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_PersistenceRecord_7();
- }
+ else {
+ tsLogger.i18NLogger.warn_PersistenceRecord_7();
+ }
}
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_PersistenceRecord_8();
- }
+ else {
+ tsLogger.i18NLogger.warn_PersistenceRecord_8();
+ }
return result;
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/ActivationRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/ActivationRecord.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/ActivationRecord.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -79,8 +79,7 @@
public void setValue (Object v)
{
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_ActivationRecord_1();
+ tsLogger.i18NLogger.warn_ActivationRecord_1();
}
/**
@@ -198,9 +197,7 @@
public boolean restore_state (InputObjectState os, int v)
{
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_ActivationRecord_2(type(), order());
- }
+ tsLogger.i18NLogger.warn_ActivationRecord_2(type(), order());
return false;
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/CadaverRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/CadaverRecord.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/CadaverRecord.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -137,12 +137,9 @@
if (oldState != null)
newStateIsValid = false;
- if (oType == RecordType.RECOVERY)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_CadaverRecord_1(order(), getTypeOfObject());
- }
- }
+ if (oType == RecordType.RECOVERY) {
+ tsLogger.i18NLogger.warn_CadaverRecord_1(order(), getTypeOfObject());
+ }
/*
* No need to forget the action since this object is
@@ -188,12 +185,9 @@
newStateIsValid = false;
- if (oType == RecordType.RECOVERY)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_CadaverRecord_1(order(), getTypeOfObject());
- }
- }
+ if (oType == RecordType.RECOVERY) {
+ tsLogger.i18NLogger.warn_CadaverRecord_1(order(), getTypeOfObject());
+ }
// super.forgetAction(false);
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/DisposeRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/DisposeRecord.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/DisposeRecord.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -154,12 +154,9 @@
return TwoPhaseOutcome.FINISH_OK;
}
}
- catch (final Throwable e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+ catch (final Throwable e) {
tsLogger.i18NLogger.warn_DisposeRecord_5(e);
}
- }
}
return TwoPhaseOutcome.FINISH_ERROR;
@@ -203,13 +200,11 @@
if ((store != null) && (objectUid.notEquals(Uid.nullUid())))
{
- if (!ObjectStoreType.valid(store.typeIs()))
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_DisposeRecord_1();
-
- res = false;
- }
+ if (!ObjectStoreType.valid(store.typeIs())) {
+ tsLogger.i18NLogger.warn_DisposeRecord_1();
+
+ res = false;
+ }
else
{
try
@@ -220,21 +215,17 @@
UidHelper.packInto(objectUid, os);
os.packString(typeName);
}
- catch (IOException e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_DisposeRecord_2();
- res = false;
- }
+ catch (IOException e) {
+ tsLogger.i18NLogger.warn_DisposeRecord_2();
+ res = false;
+ }
}
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_DisposeRecord_3();
-
- res = false;
- }
+ else {
+ tsLogger.i18NLogger.warn_DisposeRecord_3();
+
+ res = false;
+ }
return res;
}
@@ -258,14 +249,11 @@
objectUid = UidHelper.unpackFrom(os);
typeName = os.unpackString();
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+ else {
tsLogger.i18NLogger.warn_DisposeRecord_4(Integer.toString(objStoreType));
- }
- res = false;
- }
+ res = false;
+ }
}
catch (final Exception e)
{
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/LastResourceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/LastResourceRecord.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/LastResourceRecord.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -191,24 +191,17 @@
{
if (a.typeIs() == typeIs())
{
- if (ALLOW_MULTIPLE_LAST_RESOURCES)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- {
- if (!_disableMLRWarning
- || (_disableMLRWarning && !_issuedWarning)) {
- tsLogger.i18NLogger.warn_lastResource_multipleWarning(a.toString());
- _issuedWarning = true;
- }
+ if (ALLOW_MULTIPLE_LAST_RESOURCES) {
+ if (!_disableMLRWarning
+ || (_disableMLRWarning && !_issuedWarning)) {
+ tsLogger.i18NLogger.warn_lastResource_multipleWarning(a.toString());
+ _issuedWarning = true;
}
return true;
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_lastResource_disallow(a.toString());
- }
+ else {
+ tsLogger.i18NLogger.warn_lastResource_disallow(a.toString());
return false;
}
@@ -277,8 +270,7 @@
ALLOW_MULTIPLE_LAST_RESOURCES = arjPropertyManager
.getCoreEnvironmentBean().isAllowMultipleLastResources();
- if (ALLOW_MULTIPLE_LAST_RESOURCES
- && tsLogger.arjLoggerI18N.isWarnEnabled()) {
+ if (ALLOW_MULTIPLE_LAST_RESOURCES) {
tsLogger.i18NLogger.warn_lastResource_startupWarning();
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/PersistenceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/PersistenceRecord.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/PersistenceRecord.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -174,24 +174,18 @@
try
{
- if (!store.remove_uncommitted(uid, type))
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_PersistenceRecord_19();
- }
+ if (!store.remove_uncommitted(uid, type)) {
+ tsLogger.i18NLogger.warn_PersistenceRecord_19();
- return TwoPhaseOutcome.FINISH_ERROR;
- }
- }
- catch (ObjectStoreException e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_PersistenceRecord_20(e);
+ return TwoPhaseOutcome.FINISH_ERROR;
}
-
- return TwoPhaseOutcome.FINISH_ERROR;
}
+ catch (ObjectStoreException e) {
+ tsLogger.i18NLogger.warn_PersistenceRecord_20(e);
+ return TwoPhaseOutcome.FINISH_ERROR;
+ }
+
return nestedAbort();
}
@@ -227,12 +221,9 @@
{
result = store.commit_state(order(), super.getTypeOfObject());
- if (!result)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_PersistenceRecord_2(order());
- }
- }
+ if (!result) {
+ tsLogger.i18NLogger.warn_PersistenceRecord_2(order());
+ }
}
else
{
@@ -240,32 +231,24 @@
{
result = store.write_committed(order(), super.getTypeOfObject(), topLevelState);
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_PersistenceRecord_3();
- }
+ else {
+ tsLogger.i18NLogger.warn_PersistenceRecord_3();
+ }
}
}
- catch (ObjectStoreException e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_PersistenceRecord_4(e);
+ catch (ObjectStoreException e) {
+ tsLogger.i18NLogger.warn_PersistenceRecord_4(e);
- result = false;
- }
+ result = false;
+ }
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_PersistenceRecord_5();
- }
+ else {
+ tsLogger.i18NLogger.warn_PersistenceRecord_5();
+ }
- if (!result)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_PersistenceRecord_6();
- }
+ if (!result) {
+ tsLogger.i18NLogger.warn_PersistenceRecord_6();
+ }
super.forgetAction(true);
@@ -353,18 +336,14 @@
result = TwoPhaseOutcome.PREPARE_OK;
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_PersistenceRecord_7();
- }
+ else {
+ tsLogger.i18NLogger.warn_PersistenceRecord_7();
+ }
}
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_PersistenceRecord_8();
- }
+ else {
+ tsLogger.i18NLogger.warn_PersistenceRecord_8();
+ }
return result;
}
@@ -441,11 +420,9 @@
return (res && super.restore_state(os, ot));
}
}
- catch (final Exception e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_PersistenceRecord_10();
- }
+ catch (final Exception e) {
+ tsLogger.i18NLogger.warn_PersistenceRecord_10();
+ }
return res;
}
@@ -461,14 +438,11 @@
if (store != null)
{
- if (!ObjectStoreType.valid(store.typeIs()))
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_PersistenceRecord_11();
- }
+ if (!ObjectStoreType.valid(store.typeIs())) {
+ tsLogger.i18NLogger.warn_PersistenceRecord_11();
- res = false;
- }
+ res = false;
+ }
else
{
try
@@ -499,36 +473,28 @@
if (res)
topLevelState.packInto(os);
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_PersistenceRecord_14();
- }
+ else {
+ tsLogger.i18NLogger.warn_PersistenceRecord_14();
+ }
}
}
- catch (IOException e)
- {
- res = false;
+ catch (IOException e) {
+ res = false;
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_PersistenceRecord_15();
- }
+ tsLogger.i18NLogger.warn_PersistenceRecord_15();
+ }
}
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_PersistenceRecord_16();
+ else {
+ tsLogger.i18NLogger.warn_PersistenceRecord_16();
- try
- {
- os.packString(null);
- }
- catch (IOException e)
- {
- res = false;
- }
- }
+ try {
+ os.packString(null);
+ }
+ catch (IOException e) {
+ res = false;
+ }
+ }
return res && super.save_state(os, ot);
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/RecoveryRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/RecoveryRecord.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/RecoveryRecord.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -90,10 +90,8 @@
{
if (newState instanceof OutputObjectState)
state = (OutputObjectState) newState;
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_RecoveryRecord_1();
+ else {
+ tsLogger.i18NLogger.warn_RecoveryRecord_1();
}
}
@@ -129,10 +127,8 @@
ObjectType.RECOVERABLE) ? TwoPhaseOutcome.FINISH_OK
: TwoPhaseOutcome.FINISH_ERROR;
- if (result == TwoPhaseOutcome.FINISH_ERROR)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_RecoveryRecord_2();
+ if (result == TwoPhaseOutcome.FINISH_ERROR) {
+ tsLogger.i18NLogger.warn_RecoveryRecord_2();
}
return result;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/StateManagerFriend.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/StateManagerFriend.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/StateManagerFriend.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -66,11 +66,9 @@
return b.booleanValue();
}
- catch (final Throwable ex)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_abstractrecords_smf1(ex);
-
+ catch (final Throwable ex) {
+ tsLogger.i18NLogger.warn_abstractrecords_smf1(ex);
+
return false;
}
}
@@ -88,11 +86,9 @@
return b.booleanValue();
}
- catch (final Throwable ex)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_abstractrecords_smf3(ex);
-
+ catch (final Throwable ex) {
+ tsLogger.i18NLogger.warn_abstractrecords_smf3(ex);
+
return false;
}
}
@@ -107,10 +103,8 @@
m.invoke(inst, (Object[]) null);
m.setAccessible(false);
}
- catch (final Throwable ex)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_abstractrecords_smf2(ex);
+ catch (final Throwable ex) {
+ tsLogger.i18NLogger.warn_abstractrecords_smf2(ex);
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/common/BasicMutex.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/common/BasicMutex.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/common/BasicMutex.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -127,14 +127,11 @@
synchronized (_lock)
{
- if (_users <= 0)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+ if (_users <= 0) {
tsLogger.i18NLogger.warn_common_Mutex_2();
+
+ return BasicMutex.ERROR;
}
-
- return BasicMutex.ERROR;
- }
else
{
boolean done = false;
@@ -148,14 +145,11 @@
done = true;
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+ else {
tsLogger.i18NLogger.warn_common_Mutex_2();
+
+ return BasicMutex.LOCKED;
}
-
- return BasicMutex.LOCKED;
- }
}
if (!done)
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 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ActionStore.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -31,6 +31,7 @@
package com.arjuna.ats.internal.arjuna.objectstore;
+import com.arjuna.ats.arjuna.exceptions.FatalError;
import com.arjuna.ats.arjuna.objectstore.ObjectStoreType;
import com.arjuna.ats.arjuna.objectstore.StateStatus;
import com.arjuna.ats.arjuna.objectstore.StateType;
@@ -209,14 +210,12 @@
{
setupStore(locationOfStore);
}
- catch (ObjectStoreException e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.arjLogger.warn(e);
+ catch (ObjectStoreException e) {
+ tsLogger.arjLogger.warn(e);
super.makeInvalid();
- throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString(),
+ throw new FatalError(e.toString(),
e);
}
}
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 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -507,8 +507,7 @@
{
// FileLock fl = new FileLock(to);
- if (!from.exists())
- {
+ if (!from.exists()) {
/*
* from is in the cache, but not on disk. So, either
*
@@ -525,9 +524,7 @@
removeFromCache(from.toString());
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_objectstore_FileSystemStore_20(from.getName());
- }
+ tsLogger.i18NLogger.warn_objectstore_FileSystemStore_20(from.getName());
return true;
}
@@ -701,11 +698,8 @@
/* The root of the objectstore must exist and be writable */
- if ((fullStoreName == null) || !createHierarchy(fullStoreName))
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_objectstore_FileSystemStore_1(fullStoreName);
- }
+ if ((fullStoreName == null) || !createHierarchy(fullStoreName)) {
+ tsLogger.i18NLogger.warn_objectstore_FileSystemStore_1(fullStoreName);
isValid = false;
}
@@ -861,11 +855,8 @@
{
if (super.shareStatus == StateType.OS_UNSHARED)
{
- if ((FileSystemStore.fileCache.remove(fname) == null) && warn)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_objectstore_FileSystemStore_2(fname);
- }
+ if ((FileSystemStore.fileCache.remove(fname) == null) && warn) {
+ tsLogger.i18NLogger.warn_objectstore_FileSystemStore_2(fname);
}
}
}
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 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -355,11 +355,8 @@
{
NUMBEROFDIRECTORIES = arjPropertyManager.getObjectStoreEnvironmentBean().getHashedDirectories();
- if (NUMBEROFDIRECTORIES <= 0)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_objectstore_HashedStore_2(Integer.toString(NUMBEROFDIRECTORIES));
- }
+ if (NUMBEROFDIRECTORIES <= 0) {
+ tsLogger.i18NLogger.warn_objectstore_HashedStore_2(Integer.toString(NUMBEROFDIRECTORIES));
NUMBEROFDIRECTORIES = DEFAULT_NUMBER_DIRECTORIES;
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCImple.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCImple.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -193,14 +193,12 @@
_preparedStatements[pool][HIDE_STATE] = pstmt;
}
}
- catch (Exception e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_objectstore_JDBCImple_1(e);
+ catch (Exception e) {
+ tsLogger.i18NLogger.warn_objectstore_JDBCImple_1(e);
- freePool(pool);
- return false;
- }
+ freePool(pool);
+ return false;
+ }
try
{
@@ -288,14 +286,12 @@
_preparedStatements[pool][REVEAL_STATE] = pstmt;
}
}
- catch (Exception e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_objectstore_JDBCImple_2(e);
+ catch (Exception e) {
+ tsLogger.i18NLogger.warn_objectstore_JDBCImple_2(e);
- freePool(pool);
- return false;
- }
+ freePool(pool);
+ return false;
+ }
try
{
@@ -456,12 +452,8 @@
}
else
{
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_objectstore_JDBCImple_3(e);
+ tsLogger.i18NLogger.warn_objectstore_JDBCImple_3(e);
- e.printStackTrace();
- }
-
return StateStatus.OS_UNKNOWN;
}
}
@@ -527,27 +519,21 @@
theUid = new Uid(rs.getString(1));
UidHelper.packInto(theUid, store);
}
- catch (IOException ex)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_objectstore_JDBCImple_5(ex);
+ catch (IOException ex) {
+ tsLogger.i18NLogger.warn_objectstore_JDBCImple_5(ex);
- return false;
- }
- catch (Exception e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_objectstore_JDBCImple_4(e);
+ return false;
+ }
+ catch (Exception e) {
+ tsLogger.i18NLogger.warn_objectstore_JDBCImple_4(e);
- finished = true;
- }
+ finished = true;
+ }
}
}
- catch (Exception e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_objectstore_JDBCImple_4(e);
- }
+ catch (Exception e) {
+ tsLogger.i18NLogger.warn_objectstore_JDBCImple_4(e);
+ }
finally
{
try
@@ -585,11 +571,9 @@
return true;
}
- catch (Exception e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_objectstore_JDBCImple_4(e);
- }
+ catch (Exception e) {
+ tsLogger.i18NLogger.warn_objectstore_JDBCImple_4(e);
+ }
finally
{
freePool(pool);
@@ -637,27 +621,21 @@
String type = rs.getString(1);
store.packString(type);
}
- catch (IOException ex)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_objectstore_JDBCImple_7(ex);
+ catch (IOException ex) {
+ tsLogger.i18NLogger.warn_objectstore_JDBCImple_7(ex);
- return false;
- }
- catch (Exception e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_objectstore_JDBCImple_6(e);
+ return false;
+ }
+ catch (Exception e) {
+ tsLogger.i18NLogger.warn_objectstore_JDBCImple_6(e);
- finished = true;
- }
+ finished = true;
+ }
}
}
- catch (Exception e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_objectstore_JDBCImple_6(e);
- }
+ catch (Exception e) {
+ tsLogger.i18NLogger.warn_objectstore_JDBCImple_6(e);
+ }
finally
{
try
@@ -693,11 +671,9 @@
return true;
}
- catch (Exception e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_objectstore_JDBCImple_6(e);
- }
+ catch (Exception e) {
+ tsLogger.i18NLogger.warn_objectstore_JDBCImple_6(e);
+ }
finally
{
freePool(pool);
@@ -764,13 +740,11 @@
{
return remove_state(objUid, name, ft, tableName);
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_objectstore_JDBCImple_8(e);
+ else {
+ tsLogger.i18NLogger.warn_objectstore_JDBCImple_8(e);
- removeOk = false;
- }
+ removeOk = false;
+ }
}
finally
{
@@ -778,25 +752,18 @@
freePool(pool);
}
}
- else
- {
- removeOk = false;
- // can only remove (UN)COMMITTED objs
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- {
- tsLogger.i18NLogger.warn_objectstore_JDBCImple_9(Integer.toString(ft), objUid);
- }
- }
- }
- else
- {
- removeOk = false;
-
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_objectstore_JDBCImple_10(objUid);
+ else {
+ removeOk = false;
+ // can only remove (UN)COMMITTED objs
+ tsLogger.i18NLogger.warn_objectstore_JDBCImple_9(Integer.toString(ft), objUid);
}
}
+ else {
+ removeOk = false;
+ tsLogger.i18NLogger.warn_objectstore_JDBCImple_10(objUid);
+ }
+
return removeOk;
}
@@ -845,9 +812,8 @@
newImage = new InputObjectState(objUid, tName, buffer);
}
else {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_objectstore_JDBCImple_readfailed();
- }
+ tsLogger.i18NLogger.warn_objectstore_JDBCImple_readfailed();
+ }
}
catch (Throwable e)
{
@@ -945,9 +911,8 @@
if(retryConnection(e, pool)) {
return write_state(objUid, tName, state, s, tableName);
} else {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_objectstore_JDBCImple_writefailed(e);
- }
+ tsLogger.i18NLogger.warn_objectstore_JDBCImple_writefailed(e);
+ }
}
finally
{
@@ -980,20 +945,14 @@
String tableName) throws SQLException
{
_poolSizeInit = arjPropertyManager.getObjectStoreEnvironmentBean().getJdbcPoolSizeInitial();
- if (_poolSizeInit < 1)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_objectstore_JDBCImple_11(Integer.toString(_poolSizeInit));
- }
+ if (_poolSizeInit < 1) {
+ tsLogger.i18NLogger.warn_objectstore_JDBCImple_11(Integer.toString(_poolSizeInit));
_poolSizeInit = 1;
}
_poolSizeMax = arjPropertyManager.getObjectStoreEnvironmentBean().getJdbcPoolSizeMaximum();
- if (_poolSizeMax < _poolSizeInit)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_objectstore_JDBCImple_12(Integer.toString(_poolSizeMax));
- }
+ if (_poolSizeMax < _poolSizeInit) {
+ tsLogger.i18NLogger.warn_objectstore_JDBCImple_12(Integer.toString(_poolSizeMax));
_poolSizeMax = _poolSizeInit;
}
@@ -1012,14 +971,12 @@
_theConnection[i].setAutoCommit(true);
}
}
- catch (Exception e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_objectstore_JDBCImple_13(e);
+ catch (Exception e) {
+ tsLogger.i18NLogger.warn_objectstore_JDBCImple_13(e);
- _isValid = false;
- return _isValid;
- }
+ _isValid = false;
+ return _isValid;
+ }
for (int i = _poolSizeInit; i < _poolSizeMax; i++)
{
@@ -1075,13 +1032,11 @@
_isValid = true;
}
- catch (Exception e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_objectstore_JDBCImple_13(e);
+ catch (Exception e) {
+ tsLogger.i18NLogger.warn_objectstore_JDBCImple_13(e);
- _isValid = false;
- }
+ _isValid = false;
+ }
return _isValid;
}
@@ -1140,12 +1095,9 @@
return st.intValue();
}
}
- catch (Exception ex)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_objectstore_JDBCImple_14(ex);
- }
- }
+ catch (Exception ex) {
+ tsLogger.i18NLogger.warn_objectstore_JDBCImple_14(ex);
+ }
return StateStatus.OS_UNKNOWN;
}
@@ -1174,12 +1126,9 @@
{
if (shareStatus == StateType.OS_UNSHARED)
{
- if ((stateCache.remove(state) == null) && warn)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_objectstore_JDBCImple_15(state);
- }
- }
+ if ((stateCache.remove(state) == null) && warn) {
+ tsLogger.i18NLogger.warn_objectstore_JDBCImple_15(state);
+ }
}
}
@@ -1301,11 +1250,9 @@
rtn = i;
break;
}
- catch (Exception e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_objectstore_JDBCImple_16(e);
- }
+ catch (Exception e) {
+ tsLogger.i18NLogger.warn_objectstore_JDBCImple_16(e);
+ }
}
else
{
@@ -1325,10 +1272,7 @@
}
catch (InterruptedException ie)
{
- if (tsLogger.arjLoggerI18N.isInfoEnabled())
- {
- tsLogger.i18NLogger.info_objectstore_JDBCImple_17();
- }
+ tsLogger.i18NLogger.info_objectstore_JDBCImple_17();
}
}
}
@@ -1352,11 +1296,9 @@
synchronized (_inUse)
{
- if (_inUse[pool] == false)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_objectstore_JDBCImple_18();
- }
+ if (_inUse[pool] == false) {
+ tsLogger.i18NLogger.warn_objectstore_JDBCImple_18();
+ }
_inUse[pool] = false;
_inUse.notifyAll();
}
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 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/JDBCStore.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -419,12 +419,7 @@
if (jdbcAccessClassName == null)
{
- if (tsLogger.arjLoggerI18N.isFatalEnabled())
- tsLogger.arjLoggerI18N
- .fatal("com.arjuna.ats.internal.arjuna.objectstore.JDBCStore_5");
-
- throw new FatalError(
- tsLogger.i18NLogger.get_objectstore_JDBCStore_5());
+ throw new FatalError(tsLogger.i18NLogger.get_objectstore_JDBCStore_5());
}
try
@@ -433,11 +428,8 @@
}
catch (Exception e)
{
- if (tsLogger.arjLoggerI18N.isFatalEnabled())
- {
- tsLogger.i18NLogger.fatal_objectstore_JDBCStore_1(getJDBCAccess().toString(), getTableName());
- }
- throw e;
+ tsLogger.i18NLogger.fatal_objectstore_JDBCStore_1(getJDBCAccess().toString(), getTableName());
+ throw e;
}
_isValid = true;
@@ -474,10 +466,7 @@
}
catch (final Exception ex)
{
- if (tsLogger.arjLoggerI18N.isFatalEnabled())
- {
- tsLogger.i18NLogger.fatal_objectstore_JDBCStore_2(jdbcAccessClassName, ex);
- }
+ tsLogger.i18NLogger.fatal_objectstore_JDBCStore_2(jdbcAccessClassName, ex);
throw ex;
}
_theAccesses.put(jdbcAccessClassName, jdbcAccess);
@@ -530,19 +519,13 @@
}
catch (final SQLException sqle)
{
- if (tsLogger.arjLoggerI18N.isFatalEnabled())
- {
- tsLogger.i18NLogger.fatal_objectstore_JDBCStore_2("getConnection()", sqle);
- }
+ tsLogger.i18NLogger.fatal_objectstore_JDBCStore_2("getConnection()", sqle);
throw sqle;
}
if (connection == null)
{
- if (tsLogger.arjLoggerI18N.isFatalEnabled())
- {
- tsLogger.i18NLogger.fatal_objectstore_JDBCStore_1(getJDBCAccess().toString(), getTableName());
- }
+ tsLogger.i18NLogger.fatal_objectstore_JDBCStore_1(getJDBCAccess().toString(), getTableName());
throw new SQLException("getConnection returned null");
}
boolean success = false;
@@ -559,19 +542,14 @@
}
catch (final Exception ex)
{
- if (tsLogger.arjLoggerI18N.isFatalEnabled())
- {
- tsLogger.i18NLogger.fatal_objectstore_JDBCStore_2(getJDBCAccess().toString(), ex);
- }
+ tsLogger.i18NLogger.fatal_objectstore_JDBCStore_2(getJDBCAccess().toString(), ex);
throw ex;
}
if (!jdbcImple.initialise(connection, jdbcAccess,
- impleTableName))
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_objectstore_JDBCStore_3();
- throw new ObjectStoreException();
+ impleTableName)) {
+ tsLogger.i18NLogger.warn_objectstore_JDBCStore_3();
+ throw new ObjectStoreException();
}
else
{
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 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -26,6 +26,7 @@
import com.arjuna.ats.arjuna.common.Uid;
import com.arjuna.ats.arjuna.common.arjPropertyManager;
+import com.arjuna.ats.arjuna.exceptions.FatalError;
import com.arjuna.ats.arjuna.objectstore.ObjectStoreType;
import com.arjuna.ats.arjuna.objectstore.StateStatus;
import com.arjuna.ats.arjuna.objectstore.StateType;
@@ -678,15 +679,13 @@
{
setupStore(locationOfStore);
}
- catch (ObjectStoreException e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.arjLogger.warn(e);
+ catch (ObjectStoreException e) {
+ tsLogger.arjLogger.warn(e);
- super.makeInvalid();
+ super.makeInvalid();
- throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString(), e);
- }
+ throw new FatalError(e.toString(), e);
+ }
}
public LogStore()
@@ -702,14 +701,12 @@
{
setupStore(arjPropertyManager.getObjectStoreEnvironmentBean().getLocalOSRoot());
}
- catch (ObjectStoreException e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.arjLogger.warn(e);
+ catch (ObjectStoreException e) {
+ tsLogger.arjLogger.warn(e);
- super.makeInvalid();
+ super.makeInvalid();
- throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString(), e);
+ throw new FatalError(e.toString(), e);
}
}
@@ -810,14 +807,11 @@
fname = genPathName(theLog.getName(), tName, ft);
fd = openAndLock(fname, FileLock.F_WRLCK, true);
- if (fd == null)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_objectstore_ShadowingStore_18(fname);
- }
+ if (fd == null) {
+ tsLogger.i18NLogger.warn_objectstore_ShadowingStore_18(fname);
- return false;
- }
+ return false;
+ }
boolean setLength = !fd.exists();
@@ -900,12 +894,9 @@
}
}
- if (!unlockAndClose(fd, ofile))
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_objectstore_ShadowingStore_19(fname);
- }
- }
+ if (!unlockAndClose(fd, ofile)) {
+ tsLogger.i18NLogger.warn_objectstore_ShadowingStore_19(fname);
+ }
super.addToCache(fname);
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 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/NullActionStore.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -31,6 +31,7 @@
package com.arjuna.ats.internal.arjuna.objectstore;
+import com.arjuna.ats.arjuna.exceptions.FatalError;
import com.arjuna.ats.arjuna.objectstore.ObjectStoreType;
import com.arjuna.ats.arjuna.objectstore.StateStatus;
import com.arjuna.ats.arjuna.objectstore.StateType;
@@ -137,14 +138,12 @@
{
setupStore(arjPropertyManager.getObjectStoreEnvironmentBean().getLocalOSRoot());
}
- catch (ObjectStoreException e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.arjLogger.warn(e);
+ catch (ObjectStoreException e) {
+ tsLogger.arjLogger.warn(e);
super.makeInvalid();
- throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString(),
+ throw new FatalError(e.toString(),
e);
}
}
@@ -157,14 +156,12 @@
{
setupStore(locationOfStore);
}
- catch (ObjectStoreException e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.arjLogger.warn(e);
+ catch (ObjectStoreException e) {
+ tsLogger.arjLogger.warn(e);
super.makeInvalid();
- throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString(),
+ throw new FatalError(e.toString(),
e);
}
}
@@ -186,14 +183,12 @@
{
super.setupStore(location);
}
- catch (ObjectStoreException e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.arjLogger.warn(e);
+ catch (ObjectStoreException e) {
+ tsLogger.arjLogger.warn(e);
super.makeInvalid();
- throw new com.arjuna.ats.arjuna.exceptions.FatalError(e.toString(), e);
+ throw new FatalError(e.toString(), e);
}
return true;
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 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -209,10 +209,8 @@
/* Bail out if the object store is not set up */
- if (!storeValid())
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_objectstore_ShadowingStore_1();
+ if (!storeValid()) {
+ tsLogger.i18NLogger.warn_objectstore_ShadowingStore_1();
return false;
}
@@ -248,12 +246,8 @@
result = renameFromTo(shadowState, originalState);
- if (!result)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- {
- tsLogger.i18NLogger.warn_objectstore_ShadowingStore_2(shadow, filename);
- }
+ if (!result) {
+ tsLogger.i18NLogger.warn_objectstore_ShadowingStore_2(shadow, filename);
}
else
{
@@ -316,12 +310,8 @@
super.removeFromCache(path1);
super.addToCache(path2);
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- {
- tsLogger.i18NLogger.warn_objectstore_ShadowingStore_3(newState.getName(), oldState.getName());
- }
+ else {
+ tsLogger.i18NLogger.warn_objectstore_ShadowingStore_3(newState.getName(), oldState.getName());
}
newState = null;
@@ -342,12 +332,8 @@
super.removeFromCache(path1);
super.addToCache(path2);
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- {
- tsLogger.i18NLogger.warn_objectstore_ShadowingStore_3(newState.getName(), oldState.getName());
- }
+ else {
+ tsLogger.i18NLogger.warn_objectstore_ShadowingStore_3(newState.getName(), oldState.getName());
}
newState = null;
@@ -395,12 +381,8 @@
super.removeFromCache(path2);
super.addToCache(path1);
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- {
- tsLogger.i18NLogger.warn_objectstore_ShadowingStore_4(newState.getName(), oldState.getName());
- }
+ else {
+ tsLogger.i18NLogger.warn_objectstore_ShadowingStore_4(newState.getName(), oldState.getName());
}
newState = null;
@@ -421,12 +403,8 @@
super.removeFromCache(path2);
super.addToCache(path1);
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- {
- tsLogger.i18NLogger.warn_objectstore_ShadowingStore_4(newState.getName(), oldState.getName());
- }
+ else {
+ tsLogger.i18NLogger.warn_objectstore_ShadowingStore_4(newState.getName(), oldState.getName());
}
newState = null;
@@ -490,10 +468,8 @@
tsLogger.arjLogger.debug("ShadowingStore.read_state(" + objUid + ", " + tName + ", " + StateType.stateTypeString(ft) + ")");
}
- if (!storeValid())
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_objectstore_ShadowingStore_6();
+ if (!storeValid()) {
+ tsLogger.i18NLogger.warn_objectstore_ShadowingStore_6();
return null;
}
@@ -560,11 +536,8 @@
"ShadowingStore::read_state failed: " + e, e);
}
- if (!closeAndUnlock(fd, ifile, null))
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_objectstore_ShadowingStore_8(fname);
- }
+ if (!closeAndUnlock(fd, ifile, null)) {
+ tsLogger.i18NLogger.warn_objectstore_ShadowingStore_8(fname);
}
}
}
@@ -606,19 +579,11 @@
{
removeOk = false;
- if (ft == StateType.OS_ORIGINAL)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- {
- tsLogger.i18NLogger.warn_objectstore_ShadowingStore_9(objUid, name);
- }
+ if (ft == StateType.OS_ORIGINAL) {
+ tsLogger.i18NLogger.warn_objectstore_ShadowingStore_9(objUid, name);
- if (!fd.exists())
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- {
- tsLogger.i18NLogger.warn_objectstore_ShadowingStore_10(objUid, name);
- }
+ if (!fd.exists()) {
+ tsLogger.i18NLogger.warn_objectstore_ShadowingStore_10(objUid, name);
}
}
}
@@ -628,22 +593,16 @@
{
removeOk = false;
- if (ft == StateType.OS_ORIGINAL)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_objectstore_ShadowingStore_11(fname);
- }
+ if (ft == StateType.OS_ORIGINAL) {
+ tsLogger.i18NLogger.warn_objectstore_ShadowingStore_11(fname);
}
}
}
closeAndUnlock(fd, null, null);
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_objectstore_ShadowingStore_12(objUid);
- }
+ else {
+ tsLogger.i18NLogger.warn_objectstore_ShadowingStore_12(objUid);
removeOk = false;
}
@@ -661,13 +620,10 @@
tsLogger.i18NLogger.info_objectstore_ShadowingStore_15(objUid, name);
}
}
- else
- {
+ else {
removeOk = false;
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_objectstore_ShadowingStore_17(objUid);
- }
+ tsLogger.i18NLogger.warn_objectstore_ShadowingStore_17(objUid);
}
return removeOk;
@@ -696,11 +652,8 @@
File fd = openAndLock(fname, FileLock.F_WRLCK, true);
int imageSize = (int) state.length();
- if (fd == null)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_objectstore_ShadowingStore_18(fname);
- }
+ if (fd == null) {
+ tsLogger.i18NLogger.warn_objectstore_ShadowingStore_18(fname);
return false;
}
@@ -756,11 +709,8 @@
}
}
- if (!closeAndUnlock(fd, null, ofile))
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_objectstore_ShadowingStore_19(fname);
- }
+ if (!closeAndUnlock(fd, null, ofile)) {
+ tsLogger.i18NLogger.warn_objectstore_ShadowingStore_19(fname);
}
super.addToCache(fname);
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/jdbc/oracle_driver.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/jdbc/oracle_driver.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/jdbc/oracle_driver.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -122,10 +122,8 @@
newImage = new InputObjectState(objUid, tName,
buffer);
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_objectstore_jdbc_oracle_1();
+ else {
+ tsLogger.i18NLogger.warn_objectstore_jdbc_oracle_1();
}
return newImage;
@@ -271,11 +269,8 @@
}
catch (Throwable e)
{
- if (count == MAX_RETRIES - 1)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_objectstore_jdbc_oracle_2(e);
- }
+ if (count == MAX_RETRIES - 1) {
+ tsLogger.i18NLogger.warn_objectstore_jdbc_oracle_2(e);
return false;
}
try
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 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/AtomicActionRecoveryModule.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -94,12 +94,9 @@
AtomicActions = _transactionStore.allObjUids( _transactionType, aa_uids );
}
- catch ( ObjectStoreException ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+ catch ( ObjectStoreException ex ) {
tsLogger.i18NLogger.warn_recovery_AtomicActionRecoveryModule_1(ex);
}
- }
if ( AtomicActions )
{
@@ -158,12 +155,8 @@
rcvAtomicAction.replayPhase2() ;
}
- catch ( Exception ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- {
+ catch ( Exception ex ) {
tsLogger.i18NLogger.warn_recovery_AtomicActionRecoveryModule_2(recoverUid, ex);
- }
}
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/Connection.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/Connection.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/Connection.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -65,10 +65,8 @@
{
_server_socket.setSoTimeout(0);
}
- catch (java.net.SocketException ex)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_recovery_Connection_2();
+ catch (java.net.SocketException ex) {
+ tsLogger.i18NLogger.warn_recovery_Connection_2();
}
_service = service;
@@ -92,10 +90,8 @@
_service.doWork ( is, os );
}
- catch ( IOException ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_recovery_Connection_1();
+ catch ( IOException ex ) {
+ tsLogger.i18NLogger.warn_recovery_Connection_1();
}
finally
{
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 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredEntryMonitor.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -148,10 +148,7 @@
{
while( true )
{
- if (tsLogger.arjLoggerI18N.isInfoEnabled())
- {
- tsLogger.i18NLogger.warn_recovery_ExpiredEntryMonitor_12(_theTimestamper.format(new Date()));
- }
+ tsLogger.i18NLogger.warn_recovery_ExpiredEntryMonitor_12(_theTimestamper.format(new Date()));
if (_skipNext)
{
@@ -159,10 +156,7 @@
_skipNext = false;
- if (tsLogger.arjLoggerI18N.isInfoEnabled())
- {
- tsLogger.i18NLogger.info_recovery_ExpiredEntryMonitor_5();
- }
+ tsLogger.i18NLogger.info_recovery_ExpiredEntryMonitor_5();
}
else
{
@@ -263,12 +257,10 @@
tsLogger.arjLogger.debug("Loading expiry scanner "+className);
}
- if (className == null)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_recovery_ExpiredEntryMonitor_7();
-
- return;
+ if (className == null) {
+ tsLogger.i18NLogger.warn_recovery_ExpiredEntryMonitor_7();
+
+ return;
}
else
{
@@ -291,34 +283,22 @@
}
}
}
- catch (ClassCastException e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_ExpiredEntryMonitor_9(className);
- }
- }
- catch (IllegalAccessException e1)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_ExpiredEntryMonitor_6(e1);
- }
- }
- catch (InstantiationException e2)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_ExpiredEntryMonitor_6(e2);
- }
- }
+ catch (ClassCastException e) {
+ tsLogger.i18NLogger.warn_recovery_ExpiredEntryMonitor_9(className);
+ }
+ catch (IllegalAccessException e1) {
+ tsLogger.i18NLogger.warn_recovery_ExpiredEntryMonitor_6(e1);
+ }
+ catch (InstantiationException e2) {
+ tsLogger.i18NLogger.warn_recovery_ExpiredEntryMonitor_6(e2);
+ }
c = null;
}
- catch (ClassNotFoundException e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_ExpiredEntryMonitor_10(className);
- }
- }
+ catch (ClassNotFoundException e) {
+ tsLogger.i18NLogger.warn_recovery_ExpiredEntryMonitor_10(className);
}
+ }
}
/**
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionScanner.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionScanner.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionScanner.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -115,8 +115,7 @@
else
// log is present in this iteration, so move it
{
- if (tsLogger.arjLoggerI18N.isInfoEnabled())
- tsLogger.i18NLogger.info_recovery_ExpiredTransactionScanner_4(newUid);
+ tsLogger.i18NLogger.info_recovery_ExpiredTransactionScanner_4(newUid);
try
{
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionStatusManagerScanner.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionStatusManagerScanner.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionStatusManagerScanner.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -111,10 +111,7 @@
if ( timeOfDeath != null && timeOfDeath.before(oldestSurviving) )
{
- if (tsLogger.arjLoggerI18N.isInfoEnabled())
- {
- tsLogger.i18NLogger.info_recovery_ExpiredTransactionStatusManagerScanner_3(newUid);
- }
+ tsLogger.i18NLogger.info_recovery_ExpiredTransactionStatusManagerScanner_3(newUid);
_objectStore.remove_committed( newUid, _itemTypeName ) ;
}
@@ -134,10 +131,7 @@
if ( tsc.isDead() )
{
- if (tsLogger.arjLoggerI18N.isInfoEnabled())
- {
- tsLogger.i18NLogger.info_recovery_ExpiredTransactionStatusManagerScanner_3(newUid);
- }
+ tsLogger.i18NLogger.info_recovery_ExpiredTransactionStatusManagerScanner_3(newUid);
tsc.delete() ;
tsc = null ;
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 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/PeriodicRecovery.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -143,15 +143,11 @@
_listener = new Listener(getServerSocket(), _workerService);
_listener.setDaemon(true);
- if (tsLogger.arjLoggerI18N.isInfoEnabled())
- tsLogger.i18NLogger.info_recovery_PeriodicRecovery_13(_socket.getInetAddress().getHostAddress(),
+ tsLogger.i18NLogger.info_recovery_PeriodicRecovery_13(_socket.getInetAddress().getHostAddress(),
Integer.toString(_socket.getLocalPort()));
}
- catch (Exception ex)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_PeriodicRecovery_9(ex);
- }
+ catch (Exception ex) {
+ tsLogger.i18NLogger.warn_recovery_PeriodicRecovery_9(ex);
}
}
@@ -895,12 +891,10 @@
className);
}
- if (className == null)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_recovery_PeriodicRecovery_1();
+ if (className == null) {
+ tsLogger.i18NLogger.warn_recovery_PeriodicRecovery_1();
- return;
+ return;
}
else
{
@@ -913,32 +907,20 @@
RecoveryModule m = (RecoveryModule) c.newInstance();
_recoveryModules.add(m);
}
- catch (ClassCastException e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_PeriodicRecovery_2(className);
- }
+ catch (ClassCastException e) {
+ tsLogger.i18NLogger.warn_recovery_PeriodicRecovery_2(className);
}
- catch (IllegalAccessException iae)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_PeriodicRecovery_3(iae);
- }
+ catch (IllegalAccessException iae) {
+ tsLogger.i18NLogger.warn_recovery_PeriodicRecovery_3(iae);
}
- catch (InstantiationException ie)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_PeriodicRecovery_4(ie);
- }
+ catch (InstantiationException ie) {
+ tsLogger.i18NLogger.warn_recovery_PeriodicRecovery_4(ie);
}
c = null;
}
- catch ( ClassNotFoundException cnfe )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_PeriodicRecovery_5(className);
- }
+ catch ( ClassNotFoundException cnfe ) {
+ tsLogger.i18NLogger.warn_recovery_PeriodicRecovery_5(className);
}
}
}
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 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/RecActivatorLoader.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -64,10 +64,7 @@
public void startRecoveryActivators()
//public void run()
{
- if (tsLogger.arjLoggerI18N.isInfoEnabled())
- {
- tsLogger.i18NLogger.info_recovery_RecActivatorLoader_6();
- }
+ tsLogger.i18NLogger.info_recovery_RecActivatorLoader_6();
Enumeration activators = _recoveryActivators.elements();
@@ -98,13 +95,11 @@
className);
}
- if (className == null)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_recovery_RecActivatorLoader_1();
+ if (className == null) {
+ tsLogger.i18NLogger.warn_recovery_RecActivatorLoader_1();
- return;
- }
+ return;
+ }
else
{
try
@@ -116,33 +111,21 @@
RecoveryActivator ra = (RecoveryActivator) c.newInstance() ;
_recoveryActivators.add( ra );
}
- catch (ClassCastException e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_RecActivatorLoader_2(className);
- }
- }
- catch (IllegalAccessException iae)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_RecActivatorLoader_3(iae);
- }
- }
- catch (InstantiationException ie)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_RecActivatorLoader_4(ie);
- }
- }
+ catch (ClassCastException e) {
+ tsLogger.i18NLogger.warn_recovery_RecActivatorLoader_2(className);
+ }
+ catch (IllegalAccessException iae) {
+ tsLogger.i18NLogger.warn_recovery_RecActivatorLoader_3(iae);
+ }
+ catch (InstantiationException ie) {
+ tsLogger.i18NLogger.warn_recovery_RecActivatorLoader_4(ie);
+ }
c = null;
}
- catch ( ClassNotFoundException cnfe )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_RecActivatorLoader_5(className);
- }
- }
+ catch ( ClassNotFoundException cnfe ) {
+ tsLogger.i18NLogger.warn_recovery_RecActivatorLoader_5(className);
+ }
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/RecoveryManagerImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/RecoveryManagerImple.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/RecoveryManagerImple.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -96,8 +96,7 @@
if (useListener && isRecoveryManagerEndPointInUse())
{
- if (tsLogger.arjLoggerI18N.isFatalEnabled())
- {
+
try
{
tsLogger.i18NLogger.fatal_recovery_fail(RecoveryManager.getRecoveryManagerHost().getHostAddress(),
@@ -107,8 +106,8 @@
{
tsLogger.i18NLogger.fatal_recovery_fail("unknown", "unknown");
}
- }
+
throw new FatalError("Recovery manager already active (or recovery port and address are in use)!");
}
@@ -141,11 +140,8 @@
}
}
}
- catch (IOException ex)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_RecoveryManagerImple_2(ex);
- }
+ catch (IOException ex) {
+ tsLogger.i18NLogger.warn_recovery_RecoveryManagerImple_2(ex);
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/TransactionStatusConnector.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/TransactionStatusConnector.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/TransactionStatusConnector.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -94,10 +94,8 @@
{
TransactionStatusManagerItem.removeThis( _pidUid ) ;
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_recovery_TransactionStatusConnector_1();
+ else {
+ tsLogger.i18NLogger.warn_recovery_TransactionStatusConnector_1();
}
}
@@ -155,21 +153,15 @@
// _to_server.close();
// _from_server.close();
}
- catch ( IOException ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_TransactionStatusConnector_2();
- }
-
- _tsmFound = false ;
+ catch ( IOException ex ) {
+ tsLogger.i18NLogger.warn_recovery_TransactionStatusConnector_2();
+
+ _tsmFound = false;
}
- catch ( Exception other )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_TransactionStatusConnector_3();
- }
-
- _tsmFound = false ;
+ catch ( Exception other ) {
+ tsLogger.i18NLogger.warn_recovery_TransactionStatusConnector_3();
+
+ _tsmFound = false;
}
}
}
@@ -223,11 +215,8 @@
{
_to_server.println ( "OK" ) ;
_to_server.flush() ;
-
- if (tsLogger.arjLoggerI18N.isInfoEnabled())
- {
- tsLogger.i18NLogger.info_recovery_TransactionStatusConnector_4(_pid, serverHost, Integer.toString(serverPort), _connector_socket.toString());
- }
+
+ tsLogger.i18NLogger.info_recovery_TransactionStatusConnector_4(_pid, serverHost, Integer.toString(serverPort), _connector_socket.toString());
}
else
{
@@ -250,19 +239,13 @@
setDeadTSM() ;
- if (tsLogger.arjLoggerI18N.isInfoEnabled())
- {
- tsLogger.i18NLogger.info_recovery_TransactionStatusConnector_5(_pid);
- }
+ tsLogger.i18NLogger.info_recovery_TransactionStatusConnector_5(_pid);
}
}
catch ( IOException ex )
{
- if (tsLogger.arjLoggerI18N.isInfoEnabled())
- {
- tsLogger.i18NLogger.info_recovery_TransactionStatusConnector_6();
- }
+ tsLogger.i18NLogger.info_recovery_TransactionStatusConnector_6();
}
_attempts_to_establish_connection = connectionEstablished ? 0 : _attempts_to_establish_connection + 1 ;
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 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/TransactionStatusManagerItem.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -176,12 +176,9 @@
{
ret_status = getStore().remove_committed( pidUid, _typeName ) ;
}
- catch ( ObjectStoreException ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_TransactionStatusManagerItem_1(ex);
- }
- }
+ catch ( ObjectStoreException ex ) {
+ tsLogger.i18NLogger.warn_recovery_TransactionStatusManagerItem_1(ex);
+ }
return ret_status ;
}
@@ -212,14 +209,11 @@
return ret_status = true ;
}
}
- catch ( ObjectStoreException ex )
- {
- ret_status = false ;
-
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_TransactionStatusManagerItem_2(ex);
- }
- }
+ catch ( ObjectStoreException ex ) {
+ ret_status = false;
+
+ tsLogger.i18NLogger.warn_recovery_TransactionStatusManagerItem_2(ex);
+ }
return ret_status ;
}
@@ -245,12 +239,9 @@
ret_status = true ;
}
- catch ( IOException ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_TransactionStatusManagerItem_3(ex);
- }
- }
+ catch ( IOException ex ) {
+ tsLogger.i18NLogger.warn_recovery_TransactionStatusManagerItem_3(ex);
+ }
return ret_status ;
}
@@ -276,12 +267,9 @@
ret_status = true ;
}
- catch ( IOException ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_TransactionStatusManagerItem_2(ex);
- }
- }
+ catch ( IOException ex ) {
+ tsLogger.i18NLogger.warn_recovery_TransactionStatusManagerItem_2(ex);
+ }
return ret_status ;
}
@@ -305,12 +293,9 @@
objstate ) ;
}
}
- catch ( ObjectStoreException ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_TransactionStatusManagerItem_2(ex);
- }
- }
+ catch ( ObjectStoreException ex ) {
+ tsLogger.i18NLogger.warn_recovery_TransactionStatusManagerItem_2(ex);
+ }
return ret_status ;
}
@@ -328,18 +313,12 @@
{
_host = InetAddress.getLocalHost().getHostAddress() ;
- if (tsLogger.arjLoggerI18N.isInfoEnabled())
- {
- tsLogger.i18NLogger.info_recovery_TransactionStatusManagerItem_5(_host, Integer.toString(_port));
- }
+ tsLogger.i18NLogger.info_recovery_TransactionStatusManagerItem_5(_host, Integer.toString(_port));
}
- catch ( UnknownHostException ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_TransactionStatusManagerItem_4(ex);
- }
- }
+ catch ( UnknownHostException ex ) {
+ tsLogger.i18NLogger.warn_recovery_TransactionStatusManagerItem_4(ex);
}
+ }
/**
* Constructor which obtains the process uid for
@@ -356,16 +335,10 @@
Utility.hostNameToInetAddress(host);
_host = host;
- if (tsLogger.arjLoggerI18N.isInfoEnabled())
- {
- tsLogger.i18NLogger.info_recovery_TransactionStatusManagerItem_5(_host, Integer.toString(_port));
- }
+ tsLogger.i18NLogger.info_recovery_TransactionStatusManagerItem_5(_host, Integer.toString(_port));
}
- catch ( UnknownHostException ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_TransactionStatusManagerItem_4(ex);
- }
+ catch ( UnknownHostException ex ) {
+ tsLogger.i18NLogger.warn_recovery_TransactionStatusManagerItem_4(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 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/WorkerService.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -108,18 +108,13 @@
out.flush();
}
- catch (IOException ex)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.i18NLogger.warn_recovery_WorkerService_2();
- }
- catch ( Exception ex )
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_recovery_WorkerService_1(ex);
- }
- }
+ catch (IOException ex) {
+ tsLogger.i18NLogger.warn_recovery_WorkerService_2();
}
+ catch ( Exception ex ) {
+ tsLogger.i18NLogger.warn_recovery_WorkerService_1(ex);
+ }
+ }
public synchronized void notifyDone()
{
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/tools/log/EditableAtomicAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/tools/log/EditableAtomicAction.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/tools/log/EditableAtomicAction.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -42,12 +42,8 @@
_activated = activate();
- if (!_activated)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- {
- tsLogger.i18NLogger.warn_tools_log_eaa1(u, type());
- }
+ if (!_activated) {
+ tsLogger.i18NLogger.warn_tools_log_eaa1(u, type());
}
}
@@ -101,11 +97,8 @@
super.updateState();
}
- else
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_tools_log_eaa2();
- }
+ else {
+ tsLogger.i18NLogger.warn_tools_log_eaa2();
}
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/ExecProcessId.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/ExecProcessId.java 2010-06-21 15:16:55 UTC (rev 33572)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/utils/ExecProcessId.java 2010-06-21 15:41:30 UTC (rev 33573)
@@ -149,11 +149,8 @@
{
bstream.close();
}
- catch (final Exception ex)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.i18NLogger.warn_utils_ExecProcessId_5(ex);
- }
+ catch (final Exception ex) {
+ tsLogger.i18NLogger.warn_utils_ExecProcessId_5(ex);
}
}
More information about the jboss-svn-commits
mailing list