User: salborini
Date: 00/10/24 19:29:07
Modified: src/main/org/jboss/ejb/plugins
EntitySynchronizationInterceptor.java
Log:
We need to be notified when the tx is marked rollback by minerva
Revision Changes Path
1.28 +10 -6
jboss/src/main/org/jboss/ejb/plugins/EntitySynchronizationInterceptor.java
Index: EntitySynchronizationInterceptor.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/plugins/EntitySynchronizationInterceptor.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- EntitySynchronizationInterceptor.java 2000/10/21 21:32:09 1.27
+++ EntitySynchronizationInterceptor.java 2000/10/25 02:29:07 1.28
@@ -48,7 +48,7 @@
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
-* @version $Revision: 1.27 $
+* @version $Revision: 1.28 $
*/
public class EntitySynchronizationInterceptor
extends AbstractInterceptor
@@ -115,12 +115,16 @@
// OSH: An extra check to avoid warning.
// Can go when we are sure that we no longer get
// the JTA violation warning.
- if (tx.getStatus() == Status.STATUS_MARKED_ROLLBACK) {
+
+ // SA FIXME. this is a bad check. when minerva marks rollback, we
still should
+ // be notified of the tx demarcation.
+
+ //if (tx.getStatus() == Status.STATUS_MARKED_ROLLBACK) {
- ctx.setValid(false);
+ // ctx.setValid(false);
- return;
- }
+ // return;
+ //}
// We want to be notified when the transaction commits
tx.registerSynchronization(synch);
@@ -196,7 +200,7 @@
// Invocation with a running Transaction
- if (tx != null && tx.getStatus() == Status.STATUS_ACTIVE) {
+ if (tx != null && tx.getStatus() != Status.STATUS_NO_TRANSACTION) {
try {
