User: pra
Date: 01/08/24 02:56:23
Modified: src/main/org/jboss/ejb Tag: Branch_2_4
MessageDrivenEnterpriseContext.java
Log:
Merged in the setRollbackOnly bugfix for MDB, also added the log4j.jar into client,
because JMS clients need that in classpath
Revision Changes Path
No revision
No revision
1.3.6.1 +4 -3 jboss/src/main/org/jboss/ejb/MessageDrivenEnterpriseContext.java
Index: MessageDrivenEnterpriseContext.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/MessageDrivenEnterpriseContext.java,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -r1.3 -r1.3.6.1
--- MessageDrivenEnterpriseContext.java 2001/02/12 01:17:26 1.3
+++ MessageDrivenEnterpriseContext.java 2001/08/24 09:56:23 1.3.6.1
@@ -27,6 +27,7 @@
import org.jboss.logging.Logger;
+import org.jboss.metadata.MetaData;
import org.jboss.metadata.MessageDrivenMetaData;
/**
@@ -38,7 +39,7 @@
* @author Peter Antman ([EMAIL PROTECTED])
* @author Rickard �berg ([EMAIL PROTECTED])
* @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.3.6.1 $
*/
public class MessageDrivenEnterpriseContext
extends EnterpriseContext
@@ -146,7 +147,7 @@
public boolean getRollbackOnly()
{
- if (((MessageDrivenMetaData)con.getBeanMetaData()).getAcknowledgeMode() !=
MessageDrivenMetaData.CLIENT_ACKNOWLEDGE_MODE) {
+ if
(((MessageDrivenMetaData)con.getBeanMetaData()).getMethodTransactionType() !=
MetaData.TX_REQUIRED) {
// NO transaction
Logger.log("MessageDriven bean is not allowed to call getRollbackOnly
with this transaction settings");
throw new IllegalStateException("MessageDriven bean is not allowed to call
getRollbackOnly with this transaction settings");
@@ -157,7 +158,7 @@
public void setRollbackOnly()
{
- if (((MessageDrivenMetaData)con.getBeanMetaData()).getAcknowledgeMode() !=
MessageDrivenMetaData.CLIENT_ACKNOWLEDGE_MODE) {
+ if
(((MessageDrivenMetaData)con.getBeanMetaData()).getMethodTransactionType() !=
MetaData.TX_REQUIRED) {
// NO transaction
Logger.log("MessageDriven bean is not allowed to call setRollbackOnly
with this transaction settings");
throw new IllegalStateException("MessageDriven bean is not allowed to
call setRollbackOnly with this transaction settings");
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
