[jboss-cvs] JBoss Messaging SVN: r8394 - branches/Branch_1_4/src/main/org/jboss/jms/tx.

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

Author: raggz
Date: 2011-07-26 09:12:35 -0400 (Tue, 26 Jul 2011)
New Revision: 8394

Modified:
   branches/Branch_1_4/src/main/org/jboss/jms/tx/ResourceManager.java
Log:
JBMessaging-1891


Modified: branches/Branch_1_4/src/main/org/jboss/jms/tx/ResourceManager.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/tx/ResourceManager.java	2011-07-26 06:39:35 UTC (rev 8393)
+++ branches/Branch_1_4/src/main/org/jboss/jms/tx/ResourceManager.java	2011-07-26 13:12:35 UTC (rev 8394)
@@ -372,7 +372,10 @@
       
       ClientTransaction tx = removeTxInternal(xid);
       
-      if (trace) { log.trace("got tx: " + tx + " state " + tx.getState()); }
+      if (tx != null && trace) 
+      { 
+	log.trace("got tx: " + tx + " state " + tx.getState()); 
+      }
       
       //roll back for onePhase only. for 2pc, rollback only is processed in prepare
       if ((tx != null) && tx.isRollbackOnly() && onePhase)