[jboss-svn-commits] JBL Code SVN: r29813 - in labs/jbosstm/trunk: ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery and 3 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: jhalliday
Date: 2009-10-26 10:37:58 -0400 (Mon, 26 Oct 2009)
New Revision: 29813

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Uid.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/TransactionStatusConnector.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/ActionTestClient.java
   labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java
   labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/TransactionFactoryImple.java
Log:
Minor cleanup and bug fixes for Uid updates. JBTM-623


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	2009-10-26 14:33:17 UTC (rev 29812)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Uid.java	2009-10-26 14:37:58 UTC (rev 29813)
@@ -210,14 +210,12 @@
 			}
 			catch (NumberFormatException e)
 			{
-			    e.printStackTrace();
-			    
 				if (!errsOk)
 				{
 					if (tsLogger.arjLoggerI18N.isWarnEnabled())
 					{
 						tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.common.Uid_3", new Object[]
-						{ uidString });
+						{ uidString }, e);
 					}
 				}
 
@@ -225,7 +223,11 @@
 			}
 			catch (StringIndexOutOfBoundsException e)
 			{
-			    e.printStackTrace();
+                if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                {
+                    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.common.Uid_3", new Object[]
+                            { uidString }, e);
+                }
 			    
 				_valid = false;
 			}

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	2009-10-26 14:33:17 UTC (rev 29812)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/TransactionStatusConnector.java	2009-10-26 14:37:58 UTC (rev 29813)
@@ -219,8 +219,6 @@
 
             String server_pid = _from_server.readLine() ;
           
-            System.err.println("**comparing "+server_pid+" and "+_pid);
-            
             if ( Utility.hexStringToInt(server_pid) == Utility.hexStringToInt(_pid) )
             {
                if ( ! _testMode )

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/ActionTestClient.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/ActionTestClient.java	2009-10-26 14:33:17 UTC (rev 29812)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/ActionTestClient.java	2009-10-26 14:37:58 UTC (rev 29813)
@@ -219,7 +219,7 @@
             Uid pidUid = new Uid(pidUidStr);
             String pidStr = _in.readLine();
 
-            if (pidUid == Uid.nullUid()) {
+            if (pidUid.equals(Uid.nullUid())) {
                 System.err.println("Test Failed");
             } else {
                 _tsc = new TransactionStatusConnector(pidStr, pidUid);

Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java	2009-10-26 14:33:17 UTC (rev 29812)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java	2009-10-26 14:37:58 UTC (rev 29813)
@@ -403,7 +403,7 @@
 	{
 		Uid theUid = null;
 
-		while (theUid.notEquals(Uid.nullUid()))
+		while (Uid.nullUid().notEquals(theUid))
 		{
 			try
 			{

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/TransactionFactoryImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/TransactionFactoryImple.java	2009-10-26 14:33:17 UTC (rev 29812)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/TransactionFactoryImple.java	2009-10-26 14:37:58 UTC (rev 29813)
@@ -859,7 +859,7 @@
 				{
 					theUid = UidHelper.unpackFrom(uids);
 
-					if (theUid == Uid.nullUid())
+					if (theUid.equals(Uid.nullUid()))
 						finished = true;
 					else
 						count++;