[jboss-svn-commits] JBL Code SVN: r24400 - labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Dec 17 08:11:49 EST 2008
Author: jhalliday
Date: 2008-12-17 08:11:49 -0500 (Wed, 17 Dec 2008)
New Revision: 24400
Modified:
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCManager.java
Log:
Fix incorrect @message tag in JacOrbRCManager
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCManager.java 2008-12-17 12:10:53 UTC (rev 24399)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCManager.java 2008-12-17 13:11:49 UTC (rev 24400)
@@ -1,8 +1,8 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a full listing
* of individual contributors.
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
@@ -14,7 +14,7 @@
* v.2.1 along with this distribution; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -69,8 +69,8 @@
* recreated in the RecoveryManager if necessary following a crash
* of this process.
*
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_1 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCRCManager_1] - JacOrbRCManager: Created reference for tran {0} = {1}
- * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_2 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCRCManager_2] - RCManager.makeRC did not make rcvco reference
+ * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_1 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_1] - JacOrbRCManager: Created reference for tran {0} = {1}
+ * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_2 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_2] - RCManager.makeRC did not make rcvco reference
* @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_3 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_3] - RCManager could not find file in object store.
* @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_4 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_4] - RCManager could not find file in object store during setup.
* @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_5 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_5] - Unexpected exception during IOR setup {0}
@@ -97,7 +97,7 @@
/**
* We create a RecoveryCoordinator reference, but without (we think)
* actually making the implementation object available to the orb.
- * The data needed to construct the RecoveryCoordinator is put in
+ * The data needed to construct the RecoveryCoordinator is put in
* the ObjectId. If a replay_completion is received, it will be sent,
* via the locationd daemon, to the RecoveryManager.
*/
@@ -107,7 +107,7 @@
boolean isServerTransaction )
{
initialise();
-
+
RecoveryCoordinator rc = null;
// mangle those parameters to the string key (object id sort of thing)
@@ -115,32 +115,32 @@
try
{
String rcObjectId = GenericRecoveryCoordinator.makeId(RCUid, tranUid, processUid, isServerTransaction);
-
+
if (ref_ReCoo != null)
{
// New for IOR template
String new_ior = RecoverIOR.newObjectKey(ref_ReCoo, rcObjectId);
org.omg.CORBA.Object rcAsObject = ORBManager.getORB().orb().string_to_object(new_ior);
//End for IOR Template
-
+
rc = RecoveryCoordinatorHelper.narrow(rcAsObject);
if (jtsLogger.loggerI18N.isDebugEnabled())
{
- jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS,
- VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_CRASH_RECOVERY,
- "com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCRCManager_1", new java.lang.Object[]{tranUid, rc});
+ jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS,
+ VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY,
+ "com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_1", new java.lang.Object[]{tranUid, rc});
}
}
- else
+ else
{
if (JacOrbRCManager._runWithoutDaemon)
throw new NO_IMPLEMENT();
else
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_3");
-
+
rc = null;
}
}
@@ -171,7 +171,7 @@
if (!_initialised)
{
_initialised = true;
-
+
if (!_runWithoutDaemon)
{
try
@@ -200,7 +200,7 @@
}
}
}
-
+
protected char rcKeyDelimiter = '#';
static protected String ref_ReCoo = null;
@@ -211,7 +211,7 @@
private static boolean _initialised = false;
private ObjectStore currentStore;
-
+
static
{
/*
@@ -222,12 +222,12 @@
*/
String env = jtsPropertyManager.propertyManager.getProperty("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.noDaemon");
-
+
if (env != null)
{
if (env.equals("YES"))
_runWithoutDaemon = true;
}
}
-
+
}
More information about the jboss-svn-commits
mailing list