djencks 2005/11/08 15:36:46
Modified: modules/core/src/java/org/openejb/mdb EndpointHandler.java
Log:
GERONIMO-1146 fix imported transaction resume
Revision Changes Path
1.8 +4 -2
openejb/modules/core/src/java/org/openejb/mdb/EndpointHandler.java
Index: EndpointHandler.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/mdb/EndpointHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- EndpointHandler.java 22 Jul 2005 22:01:29 -0000 1.7
+++ EndpointHandler.java 8 Nov 2005 20:36:46 -0000 1.8
@@ -377,7 +377,9 @@
// restore the adapter transaction is possible
transactionContextManager.setContext(adapterTransaction);
- if (adapterTransaction != null) {
+ //only resume adapter transaction if it exists and if it was
suspended:
+ //this can be detected by testing beanTransaction != null
+ if (adapterTransaction != null && beanTransaction != null) {
try {
adapterTransaction.resume();
} catch (Throwable resumeException) {
