[Mulgara-svn] r1345 - trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi

[ronald at mulgara.org]

Author: ronald
Date: 2008-10-23 06:11:22 -0700 (Thu, 23 Oct 2008)
New Revision: 1345

Modified:
   trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/AbstractXAResource.java
   trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/DummyXAResource.java
Log:
Format the xid consistently in the logs.

Modified: trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/AbstractXAResource.java
===================================================================
--- trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/AbstractXAResource.java	2008-10-23 13:11:16 UTC (rev 1344)
+++ trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/AbstractXAResource.java	2008-10-23 13:11:22 UTC (rev 1345)
@@ -95,8 +95,7 @@
 
   public void start(Xid xid, int flags) throws XAException {
     if (logger.isDebugEnabled()) {
-      logger.debug("Start xid=" + System.identityHashCode(xid) + " flags=" + formatFlags(flags));
-      logger.debug("xid.format=" + xid.getFormatId() + " xid.gblTxId=" + Arrays.toString(xid.getGlobalTransactionId()) + " xid.brnchQual=" + Arrays.toString(xid.getBranchQualifier()));
+      logger.debug("Start xid=" + formatXid(xid) + " flags=" + formatFlags(flags));
     }
 
     T tx = resourceManager.transactions.get(new XidWrapper(xid));
@@ -109,14 +108,13 @@
           throw new XAException(XAException.XAER_NOTA);
         }
         if (logger.isDebugEnabled()) {
-          logger.debug("Resuming transaction on xid=" + System.identityHashCode(xid));
+          logger.debug("Resuming transaction on xid=" + formatXid(xid));
         }
         break;
 
       case XAResource.TMNOFLAGS:
         if (tx != null) {
-          logger.warn("Received plain start for existing tx");
-          logger.warn("xid.format=" + xid.getFormatId() + " xid.gblTxId=" + Arrays.toString(xid.getGlobalTransactionId()) + " xid.brnchQual=" + Arrays.toString(xid.getBranchQualifier()));
+          logger.warn("Received plain start for existing tx: xid=" + formatXid(xid));
           throw new XAException(XAException.XAER_DUPID);
         }
         // fallthrough
@@ -133,7 +131,7 @@
         // XXX: is this correct? Or should we actually roll back here?
         if (tx != null)
           tx.rollback = true;
-        logger.error("Unrecognised flags in start: xid=" + System.identityHashCode(xid) + " flags=" + formatFlags(flags));
+        logger.error("Unrecognised flags in start: xid=" + formatXid(xid) + " flags=" + formatFlags(flags));
         throw new XAException(XAException.XAER_INVAL);
     }
 
@@ -148,7 +146,7 @@
 
   public void end(Xid xid, int flags) throws XAException {
     if (logger.isDebugEnabled()) {
-      logger.debug("End xid=" + System.identityHashCode(xid) + " flags=" + formatFlags(flags));
+      logger.debug("End xid=" + formatXid(xid) + " flags=" + formatFlags(flags));
     }
 
     T tx = resourceManager.transactions.get(new XidWrapper(xid));
@@ -168,7 +166,7 @@
 
   public int prepare(Xid xid) throws XAException {
     if (logger.isDebugEnabled()) {
-      logger.debug("Prepare xid=" + System.identityHashCode(xid));
+      logger.debug("Prepare xid=" + formatXid(xid));
     }
 
     T tx = resourceManager.transactions.get(new XidWrapper(xid));
@@ -197,7 +195,7 @@
 
   public void commit(Xid xid, boolean onePhase) throws XAException {
     if (logger.isDebugEnabled()) {
-      logger.debug("Commit xid=" + System.identityHashCode(xid) + " onePhase=" + onePhase);
+      logger.debug("Commit xid=" + formatXid(xid) + " onePhase=" + onePhase);
     }
 
     T tx = resourceManager.transactions.get(new XidWrapper(xid));
@@ -237,7 +235,7 @@
       // This is a serious problem since the database is now in an
       // inconsistent state.
       // Make sure the exception is logged.
-      logger.fatal("Failed to commit resource in transaction " + xid, th);
+      logger.fatal("Failed to commit resource in transaction " + formatXid(xid), th);
       throw new XAException(XAException.XAER_RMERR);
     } finally {
       if (clean) {
@@ -248,7 +246,7 @@
 
   public void rollback(Xid xid) throws XAException {
     if (logger.isDebugEnabled()) {
-      logger.debug("Rollback xid=" + System.identityHashCode(xid));
+      logger.debug("Rollback xid=" + formatXid(xid));
     }
 
     T tx = resourceManager.transactions.get(new XidWrapper(xid));
@@ -269,7 +267,7 @@
       // This is a serious problem since the database is now in an
       // inconsistent state.
       // Make sure the exception is logged.
-      logger.fatal("Failed to rollback resource in transaction " + xid, th);
+      logger.fatal("Failed to rollback resource in transaction " + formatXid(xid), th);
       throw new XAException(XAException.XAER_RMERR);
     } finally {
       if (clean) {
@@ -280,7 +278,7 @@
 
   public void forget(Xid xid) throws XAException {
     if (logger.isDebugEnabled()) {
-      logger.debug("Forget xid=" + System.identityHashCode(xid));
+      logger.debug("Forget xid=" + formatXid(xid));
     }
 
     T tx = resourceManager.transactions.get(new XidWrapper(xid));
@@ -298,7 +296,7 @@
       }
       throw xae;
     } catch (Throwable th) {
-      logger.error("Failed to forget transaction " + xid, th);
+      logger.error("Failed to forget transaction " + formatXid(xid), th);
       clean = false;
       throw new XAException(XAException.XAER_RMERR);
     } finally {

Modified: trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/DummyXAResource.java
===================================================================
--- trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/DummyXAResource.java	2008-10-23 13:11:16 UTC (rev 1344)
+++ trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/DummyXAResource.java	2008-10-23 13:11:22 UTC (rev 1345)
@@ -175,6 +175,17 @@
   //
 
   /**
+   * Format an xid for printing.
+   *
+   * @param xid the xid to format
+   * @return a string representation of the xid
+   */
+  protected static final String formatXid(Xid xid) {
+    return "[" + xid.getFormatId() + ":" + Arrays.hashCode(xid.getGlobalTransactionId()) + ":" +
+           Arrays.hashCode(xid.getBranchQualifier()) + "]";
+  }
+
+  /**
    * Format bitmasks defined by {@link XAResource}.
    *
    * @param flags  a bitmask composed from the constants defined in {@link XAResource}