[jboss-svn-commits] JBL Code SVN: r16042 - labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils.

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

Author: mark.little at jboss.com
Date: 2007-10-24 05:56:41 -0400 (Wed, 24 Oct 2007)
New Revision: 16042

Modified:
   labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/XAHelper.java
Log:
http://jira.jboss.com/jira/browse/JBTM-297

Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/XAHelper.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/XAHelper.java	2007-10-24 08:32:33 UTC (rev 16041)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/XAHelper.java	2007-10-24 09:56:41 UTC (rev 16042)
@@ -145,9 +145,9 @@
 					return false;
 
 				byte[] bqual1 = x1.getBranchQualifier();
-                final int bqual1Len = (bqual1 == null ? 0 : bqual1.length) ;
+				final int bqual1Len = (bqual1 == null ? 0 : bqual1.length) ;
 				byte[] bqual2 = x2.getBranchQualifier();
-                final int bqual2Len = (bqual2 == null ? 0 : bqual2.length) ;
+				final int bqual2Len = (bqual2 == null ? 0 : bqual2.length) ;
 
 				if (bqual1Len == bqual2Len)
 				{
@@ -174,22 +174,20 @@
 
 	public static String xidToString (Xid xid)
 	{
-		String globalTranId = new String(xid.getGlobalTransactionId()); // could
-																		// be
-																		// garbage!
-        final byte[] qualifier = xid.getBranchQualifier() ;
+	    byte[] gid = xid.getGlobalTransactionId();
+	    byte[] bqual = xid.getBranchQualifier();
+	    String toReturn = "< " + xid.getFormatId() + ", " + gid.length + ", "
+				+ bqual.length + ", ";
 
-        if ((qualifier != null) && (qualifier.length > 0))
-        {
-            String branchQualifier = new String(qualifier); // and
-            // this
-    		return new String("< " + xid.getFormatId() + ", " + globalTranId + ", "
-    				+ branchQualifier + " >");
-        }
-        else
-        {
-            return new String("< " + xid.getFormatId() + ", " + globalTranId + " >");
-        }
+	    for (int i = 0; i < gid.length; i++)
+		toReturn += gid[i];
+
+	    for (int j = 0; j < bqual.length; j++)
+		toReturn += bqual[j];
+
+	    toReturn += " >";
+
+	    return toReturn;
 	}
 
 }