User: oberg
Date: 00/08/16 05:22:37
Modified: src/main/org/jboss/tm TxManager.java
Log:
Fixed getStatus on STATUS_NO_TRANSACTION
Revision Changes Path
1.9 +3 -2 jboss/src/main/org/jboss/tm/TxManager.java
Index: TxManager.java
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/tm/TxManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TxManager.java 2000/08/12 00:20:44 1.8
+++ TxManager.java 2000/08/16 12:22:37 1.9
@@ -31,7 +31,7 @@
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class TxManager
implements TransactionManager
@@ -235,7 +235,8 @@
throws SystemException
{
// Look up the txCapsule and delegate
- return ((TxCapsule) txCapsules.get(tx)).getStatus();
+ TxCapsule txCap = ((TxCapsule) txCapsules.get(tx));
+ return txCap == null ? Status.STATUS_NO_TRANSACTION : txCap.getStatus();
}
public void registerSynchronization(Transaction tx, Synchronization s)
