User: pra
Date: 01/02/28 01:25:41
Modified: src/main/org/jboss/ejb/plugins
MessageDrivenInstanceInterceptor.java
MessageDrivenInstancePool.java
MessageDrivenTxInterceptorBMT.java
Log:
MDB deployment descriptor now follows the latest EJB2.0 DTD; code clean up done;
message receipt now allways transacted
Revision Changes Path
1.3 +2 -1
jboss/src/main/org/jboss/ejb/plugins/MessageDrivenInstanceInterceptor.java
Index: MessageDrivenInstanceInterceptor.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/plugins/MessageDrivenInstanceInterceptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MessageDrivenInstanceInterceptor.java 2001/01/03 08:28:31 1.2
+++ MessageDrivenInstanceInterceptor.java 2001/02/28 09:25:40 1.3
@@ -22,7 +22,7 @@
* @see <related>
* @author Peter Antman ([EMAIL PROTECTED])
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class MessageDrivenInstanceInterceptor
extends StatelessSessionInstanceInterceptor
@@ -76,3 +76,4 @@
}
}
}
+
1.3 +7 -1
jboss/src/main/org/jboss/ejb/plugins/MessageDrivenInstancePool.java
Index: MessageDrivenInstancePool.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/plugins/MessageDrivenInstancePool.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MessageDrivenInstancePool.java 2001/01/03 08:28:31 1.2
+++ MessageDrivenInstancePool.java 2001/02/28 09:25:40 1.3
@@ -18,7 +18,7 @@
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
* @author Peter Antman ([EMAIL PROTECTED])
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class MessageDrivenInstancePool
extends AbstractInstancePool
@@ -53,3 +53,9 @@
// Inner classes -------------------------------------------------
}
+
+
+
+
+
+
1.4 +16 -13
jboss/src/main/org/jboss/ejb/plugins/MessageDrivenTxInterceptorBMT.java
Index: MessageDrivenTxInterceptorBMT.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/plugins/MessageDrivenTxInterceptorBMT.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MessageDrivenTxInterceptorBMT.java 2001/01/30 15:59:14 1.3
+++ MessageDrivenTxInterceptorBMT.java 2001/02/28 09:25:40 1.4
@@ -28,7 +28,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
* @author Peter Antman ([EMAIL PROTECTED])
-* @version $Revision: 1.3 $
+* @version $Revision: 1.4 $
*/
public class MessageDrivenTxInterceptorBMT
extends TxInterceptorBMT
@@ -50,33 +50,33 @@
// Store old UserTX
Object oldUserTx = userTransaction.get();
-
-
- // retrieve the real userTransaction
-
userTransaction.set(((MessageDrivenEnterpriseContext)mi.getEnterpriseContext()).getMessageDrivenContext().getUserTransaction());
-
+
+
+ // retrieve the real userTransaction
+
userTransaction.set(((MessageDrivenEnterpriseContext)mi.getEnterpriseContext()).getMessageDrivenContext().getUserTransaction());
+
// t1 refers to the client transaction (spec ejb1.1, 11.6.1, p174)
// this is necessary for optimized (inVM) calls: threads come associated
with the client transaction
Transaction t1 = tm.disassociateThread();
-//DEBUG Logger.debug("TxInterceptorBMT disassociate" + ((t1==null) ? "null":
Integer.toString(t1.hashCode())));
-
+ //DEBUG Logger.debug("TxInterceptorBMT disassociate" + ((t1==null) ?
"null": Integer.toString(t1.hashCode())));
+
// t2 refers to the instance transaction (spec ejb1.1, 11.6.1, p174)
Transaction t2 = mi.getEnterpriseContext().getTransaction();
-
- // This is BMT so the transaction is dictated by the Bean, the MethodInvocation
follows
- mi.setTransaction(t2);
+
+ // This is BMT so the transaction is dictated by the Bean, the
MethodInvocation follows
+ mi.setTransaction(t2);
- //DEBUG Logger.debug("TxInterceptorBMT t2 in context" + ((t2==null) ? "null":
Integer.toString(t2.hashCode())));
+ //DEBUG Logger.debug("TxInterceptorBMT t2 in context" + ((t2==null) ? "null":
Integer.toString(t2.hashCode())));
try {
if (t2 != null) {
// associate the transaction to the thread
- tm.associateThread(t2);
+ tm.associateThread(t2);
}
@@ -164,4 +164,7 @@
}
}
}
+
+
+
