Hi,
Pardon me but what is this CVS all about?
I saw someone's message saying that he solved the problem by getting the
latest CVS...is it the latest "patch" which we can use that was not in the
binary that can be downloaded?
Thanks.
Regards,
Ken, See Kai Leong
----- Original Message -----
From: "jBoss CVS Development" <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Friday, September 08, 2000 13:23
Subject: [jBoss-Dev] CVS update:
jboss/src/main/org/jboss/ejb/pluginsTxInterceptor.java
> User: fleury
> Date: 00/09/07 22:23:19
>
> Modified: src/main/org/jboss/ejb/plugins TxInterceptor.java
> Log:
> Fixed behaviour for inVM thread passing
>
> Revision Changes Path
> 1.15 +300 -284
jboss/src/main/org/jboss/ejb/plugins/TxInterceptor.java
>
> Index: TxInterceptor.java
> ===================================================================
> RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/plugins/TxInterceptor.java
,v
> retrieving revision 1.14
> retrieving revision 1.15
> diff -u -r1.14 -r1.15
> --- TxInterceptor.java 2000/08/25 02:05:13 1.14
> +++ TxInterceptor.java 2000/09/08 05:23:19 1.15
> @@ -38,7 +38,7 @@
> * @see <related>
> * @author Rickard �berg ([EMAIL PROTECTED])
> * @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
> -* @version $Revision: 1.14 $
> +* @version $Revision: 1.15 $
> */
> public class TxInterceptor
> extends AbstractInterceptor
> @@ -57,30 +57,30 @@
> // Public --------------------------------------------------------
> public void setContainer(Container container)
> {
> - this.container = container;
> + this.container = container;
> }
>
> public Container getContainer()
> {
> - return container;
> + return container;
> }
>
> // Interceptor
implementation --------------------------------------
> public void init()
> throws Exception
> {
> - // Store TM reference locally
> - tm = (TxManager) getContainer().getTransactionManager();
> -
> - // Find out method->tx-type mappings from meta-info
> - // EnterpriseBean eb = getContainer.getMetaData();
> - // eb.getBeanContext()
> + // Store TM reference locally
> + tm = (TxManager) getContainer().getTransactionManager();
> +
> + // Find out method->tx-type mappings from meta-info
> + // EnterpriseBean eb = getContainer.getMetaData();
> + // eb.getBeanContext()
> }
>
> public Object invokeHome(MethodInvocation mi)
> throws Exception
> {
> - return runWithTransactions(false, mi);
> + return runWithTransactions(false, mi);
> }
>
> /**
> @@ -93,300 +93,316 @@
> * @exception Exception
> */
> public Object invoke(MethodInvocation mi) throws Exception {
> - return runWithTransactions(true, mi);
> + return runWithTransactions(true, mi);
> }
>
> private void printMethod(Method m, byte type) {
> - String name;
> - switch(type) {
> - case MetaData.TX_MANDATORY:
> - name = "TX_MANDATORY";
> - break;
> - case MetaData.TX_NEVER:
> - name = "TX_NEVER";
> - break;
> - case MetaData.TX_NOT_SUPPORTED:
> - name = "TX_NOT_SUPPORTED";
> - break;
> - case MetaData.TX_REQUIRED:
> - name = "TX_REQUIRED";
> - break;
> - case MetaData.TX_REQUIRES_NEW:
> - name = "TX_REQUIRES_NEW";
> - break;
> - case MetaData.TX_SUPPORTS:
> - name = "TX_SUPPORTS";
> - break;
> - default:
> - name = "TX_UNKNOWN";
> - }
> - Logger.debug(name+" for "+m.getName());
> + String name;
> + switch(type) {
> + case MetaData.TX_MANDATORY:
> + name = "TX_MANDATORY";
> + break;
> + case MetaData.TX_NEVER:
> + name = "TX_NEVER";
> + break;
> + case MetaData.TX_NOT_SUPPORTED:
> + name = "TX_NOT_SUPPORTED";
> + break;
> + case MetaData.TX_REQUIRED:
> + name = "TX_REQUIRED";
> + break;
> + case MetaData.TX_REQUIRES_NEW:
> + name = "TX_REQUIRES_NEW";
> + break;
> + case MetaData.TX_SUPPORTS:
> + name = "TX_SUPPORTS";
> + break;
> + default:
> + name = "TX_UNKNOWN";
> + }
> + Logger.debug(name+" for "+m.getName());
> }
>
> private Object invokeNext(boolean remoteInvocation,
MethodInvocation mi) throws Exception {
> - if (remoteInvocation) {
> - return getNext().invoke(mi);
> - } else {
> - return getNext().invokeHome(mi);
> - }
> + if (remoteInvocation) {
> + return getNext().invoke(mi);
> + } else {
> + return getNext().invokeHome(mi);
> + }
> }
>
>
> private Object runWithTransactions(boolean remoteInvocation,
MethodInvocation mi) throws Exception {
> -
> - // Old transaction is the transaction that comes with the MI
> - Transaction oldTransaction = mi.getTransaction();
> +
> + // Old transaction is the transaction that comes with the MI
> + Transaction oldTransaction = mi.getTransaction();
> // New transaction is the new transaction this might start
> - Transaction newTransaction = null;
> -
> -//DEBUG Logger.log("Current transaction in MI is
"+mi.getTransaction());
> -//DEBUG Logger.log("Current method "+mi.getMethod().getName());
> - byte transType = getTransactionMethod(mi.getMethod(),
remoteInvocation);
> -
> - printMethod(mi.getMethod(), transType);
> -
> - switch (transType) {
> -
> - case MetaData.TX_NOT_SUPPORTED: {
> -
> -
> - // Thread arriving must be clean (jboss doesn't set the
thread previously)
> - // But for robustness purposes we disassociate the thread
> - tm.disassociateThread();
> -
> - // Do not set a transaction on the thread even if in MI, just
run
> - return invokeNext(remoteInvocation,mi );
> -
> - // We don't have to do anything since we don't deal with
transactions
> - }
> -
> -
> - case MetaData.TX_REQUIRED: {
> -
> - if (oldTransaction == null) { // No tx running
> -
> - Logger.debug("Begin tx");
> -
> - // Create tx
> - tm.begin();
> -
> - // get the tx
> - newTransaction = tm.getTransaction();
> -
> - // Let the method invocation know
> - mi.setTransaction(newTransaction);
> - }
> -
> - else { // We have a tx propagated
> -
> - // Associate it with the thread
> - tm.associateThread(oldTransaction);
> - }
> -
> - // Continue invocation
> - try {
> -
> - return invokeNext(remoteInvocation,mi );
> - }
> - catch (RemoteException e) {
> -
> - if (newTransaction != null) {
> -
> - file://We started it,
> - newTransaction.rollback();
> - }
> -
> - throw e;
> - }
> - catch (RuntimeException e) {
> -
> - if (newTransaction != null) {
> -
> - // We started it
> - newTransaction.rollback();
> - }
> -
> - throw new ServerException("Exception occurred", e);
> - }
> - catch (Error e) {
> -
> - if (newTransaction != null) {
> -
> - // we started it
> - newTransaction.rollback();
> - }
> - throw new ServerException("Exception
occurred:"+e.getMessage());
> - }
> -
> - finally {
> + Transaction newTransaction = null;
> +
> + file://DEBUG Logger.log("Current transaction in MI is
"+mi.getTransaction());
> + file://DEBUG Logger.log("Current method
"+mi.getMethod().getName());
> + byte transType = getTransactionMethod(mi.getMethod(),
remoteInvocation);
> +
> + printMethod(mi.getMethod(), transType);
> +
> + switch (transType) {
>
> - file://DEBUG Logger.log("In finally");
> -
> - // Only do something if we started the transaction
> - if (newTransaction != null) {
> -
> - // Marked rollback
> - if (newTransaction.getStatus() ==
Status.STATUS_MARKED_ROLLBACK) {
> -
> - Logger.log("rolling back");
> - // actually roll it back
> - newTransaction.rollback();
> - }
> -
> - file://Still running
> - else if(newTransaction.getStatus() ==
Status.STATUS_ACTIVE) {
> + case MetaData.TX_NOT_SUPPORTED: {
> +
> +
> + // Thread arriving must be clean (jboss doesn't set
the thread previously)
> + // However optimized calls come with associated
thread for example
> + Transaction threadTx = tm.disassociateThread();
> +
> + try {
> +
> + // Do not set a transaction on the thread even
if in MI, just run
> + return invokeNext(remoteInvocation,mi );
> + }
> + finally {
> +
> + // IN case we had a Tx associated with the
thread reassociate
> + if (threadTx != null) {
> +
> + tm.associateThread(threadTx);
> + }
> + }
> + }
> +
> +
> + case MetaData.TX_REQUIRED: {
> +
> + if (oldTransaction == null) { // No tx running
> +
> + // Create tx
> + tm.begin();
> +
> + // get the tx
> + newTransaction = tm.getTransaction();
> +
> + // Let the method invocation know
> + mi.setTransaction(newTransaction);
> + }
> +
> + else { // We have a tx propagated
> +
> + // Associate it with the thread
> + tm.associateThread(oldTransaction);
> + }
> +
> + // Continue invocation
> + try {
> +
> + return invokeNext(remoteInvocation,mi );
> + }
> + catch (RemoteException e) {
> +
> + if (newTransaction != null) {
> +
> + file://We started it,
> + newTransaction.rollback();
> + }
> +
> + throw e;
> + }
> + catch (RuntimeException e) {
> +
> + if (newTransaction != null) {
> +
> + // We started it
> + newTransaction.rollback();
> + }
> +
> + throw new ServerException("Exception occurred",
e);
> + }
> + catch (Error e) {
> +
> + if (newTransaction != null) {
> +
> + // we started it
> + newTransaction.rollback();
> + }
> + throw new ServerException("Exception
occurred:"+e.getMessage());
> + }
> +
> + finally {
> +
> + file://DEBUG Logger.log("In finally");
> +
> + // Only do something if we started the
transaction
> + if (newTransaction != null) {
> +
> + // Marked rollback
> + if (newTransaction.getStatus() ==
Status.STATUS_MARKED_ROLLBACK) {
> +
> + // actually roll it back
> + newTransaction.rollback();
> + }
> +
> + file://Still running
> + else if(newTransaction.getStatus() ==
Status.STATUS_ACTIVE) {
> +
> + // Commit tx
> + // This will happen if
> + // a) everything goes well
> + // b) app. exception was thrown
> + newTransaction.commit();
> + }
> +
> + // reassociate the oldTransaction with the
methodInvocation (even null)
> + mi.setTransaction(oldTransaction);
> + }
> + }
> + }
> +
> + case MetaData.TX_SUPPORTS: {
> +
> + if (oldTransaction != null) { // We have a tx
propagated
> +
> + // Associate it with the thread
> + tm.associateThread(oldTransaction);
> + }
> +
> + // If we don't have a tx propagated we don't do
anything
> +
> + // Continue invocation
> + try {
> +
> + return invokeNext(remoteInvocation,mi );
> + }
> + catch (RuntimeException e) {
> +
> + throw new ServerException("Exception occurred",
e);
> + }
> + catch (Error e) {
> +
> + throw new ServerException("Exception
occurred:"+e.getMessage());
> + }
> +
> + // Even on error we don't do anything with the tx,
we didn't start it
> +
> + }
> +
> + case MetaData.TX_REQUIRES_NEW: {
> +
> + // Thread arriving must be clean (jboss doesn't set
the thread previously)
> + // However optimized calls come with associated
thread for example
> + Transaction threadTx = tm.disassociateThread();
> +
>
> - Logger.log("commiting");
> - // Commit tx
> - // This will happen if
> - // a) everything goes well
> - // b) app. exception was thrown
> - newTransaction.commit();
> - }
> -
> - // reassociate the oldTransaction with the
methodInvocation (even null)
> - mi.setTransaction(oldTransaction);
> - }
> - }
> - }
> -
> - case MetaData.TX_SUPPORTS: {
> -
> - if (oldTransaction != null) { // We have a tx propagated
> -
> - // Associate it with the thread
> - tm.associateThread(oldTransaction);
> - }
> -
> - // If we don't have a tx propagated we don't do anything
> -
> - // Continue invocation
> - try {
> -
> - return invokeNext(remoteInvocation,mi );
> - }
> - catch (RuntimeException e) {
> -
> - throw new ServerException("Exception occurred", e);
> - }
> - catch (Error e) {
> -
> - throw new ServerException("Exception
occurred:"+e.getMessage());
> - }
> -
> - // Even on error we don't do anything with the tx, we didn't
start it
> -
> - }
> -
> - case MetaData.TX_REQUIRES_NEW: {
> -
> - // Always begin a transaction
> - tm.begin();
> -
> - // get it
> - newTransaction = tm.getTransaction();
> -
> - // Set it on the method invocation
> - mi.setTransaction(newTransaction);
> -
> - // Continue invocation
> - try {
> -
> - return invokeNext(remoteInvocation,mi );
> - }
> - catch (RemoteException e) {
> -
> - // We started it for sure
> - newTransaction.rollback();
> -
> - throw e;
> - }
> - catch (RuntimeException e) {
> -
> - // We started it for sure
> - newTransaction.rollback();
> -
> - throw new ServerException("Exception occurred", e);
> - }
> - catch (Error e) {
> -
> - // We started it for sure
> - newTransaction.rollback();
> -
> - throw new ServerException("Exception
occurred:"+e.getMessage());
> - }
> - finally {
> -
> - // We started the transaction for sure so we commit or
roll back
> -
> - if (newTransaction.getStatus() ==
Status.STATUS_MARKED_ROLLBACK) {
> -
> - newTransaction.rollback();
> - }
> - else {
> -
> - // Commit tx
> - // This will happen if
> - // a) everything goes well
> - // b) app. exception was thrown
> - newTransaction.commit();
> - }
> -
> - // set the old transaction back on the method invocation
> - mi.setTransaction(oldTransaction);
> - }
> - }
> -
> - case MetaData.TX_MANDATORY: {
> -
> - if (oldTransaction == null) { // no transaction = bad!
> -
> - throw new TransactionRequiredException("read the spec!");
> - }
> - else {
> -
> - // Associate it with the thread
> - tm.associateThread(oldTransaction);
> -
> - // That's it
> - return invokeNext(remoteInvocation,mi );
> - }
> - }
> -
> - case MetaData.TX_NEVER: {
> -
> - if (oldTransaction != null) { // Transaction = bad!
> -
> - throw new RemoteException("Transaction not allowed");
> - }
> - else {
> -
> - return invokeNext(remoteInvocation,mi );
> - }
> - }
> - }
> -
> - return null;
> + // Always begin a transaction
> + tm.begin();
> +
> + // get it
> + newTransaction = tm.getTransaction();
> +
> + // Set it on the method invocation
> + mi.setTransaction(newTransaction);
> +
> + // Continue invocation
> + try {
> +
> + return invokeNext(remoteInvocation,mi );
> + }
> + catch (RemoteException e) {
> +
> + // We started it for sure
> + newTransaction.rollback();
> +
> + throw e;
> + }
> + catch (RuntimeException e) {
> +
> + // We started it for sure
> + newTransaction.rollback();
> +
> + throw new ServerException("Exception occurred",
e);
> + }
> + catch (Error e) {
> +
> + // We started it for sure
> + newTransaction.rollback();
> +
> + throw new ServerException("Exception
occurred:"+e.getMessage());
> + }
> + finally {
> +
> + // We started the transaction for sure so we
commit or roll back
> +
> + if (newTransaction.getStatus() ==
Status.STATUS_MARKED_ROLLBACK) {
> +
> + newTransaction.rollback();
> + }
> + else {
> +
> + // Commit tx
> + // This will happen if
> + // a) everything goes well
> + // b) app. exception was thrown
> + newTransaction.commit();
> + }
> +
> + // set the old transaction back on the method
invocation
> + mi.setTransaction(oldTransaction);
> +
> + // IN case we had a Tx associated with the
thread reassociate
> + if (threadTx != null) {
> +
> + tm.associateThread(threadTx);
> + }
> + }
> + }
> +
> + case MetaData.TX_MANDATORY: {
> +
> + if (oldTransaction == null) { // no transaction =
bad!
> +
> + throw new
TransactionRequiredException("Transaction Required, read the spec!");
> + }
> + else {
> +
> + // Associate it with the thread
> + tm.associateThread(oldTransaction);
> +
> + // That's it
> + return invokeNext(remoteInvocation,mi );
> + }
> + }
> +
> + case MetaData.TX_NEVER: {
> +
> + if (oldTransaction != null) { // Transaction = bad!
> +
> + throw new RemoteException("Transaction not
allowed");
> + }
> + else {
> +
> + return invokeNext(remoteInvocation,mi );
> + }
> + }
> + }
> +
> + return null;
> }
>
> // Protected ----------------------------------------------------
>
> // This should be cached, since this method is called very often
> protected byte getTransactionMethod(Method m, boolean
remoteInvocation) {
> - Byte b = (Byte)methodTx.get(m);
> - if(b != null) return b.byteValue();
> -
> - BeanMetaData bmd = container.getBeanMetaData();
> - file://DEBUG Logger.log("Found metadata for bean
'"+bmd.getEjbName()+"'"+" method is "+m.getName());
> - byte result = bmd.getMethodTransactionType(m.getName(),
m.getParameterTypes(), remoteInvocation);
> -
> - // provide default if method is not found in descriptor
> - if (result == MetaData.TX_UNKNOWN) result =
MetaData.TX_REQUIRED;
> -
> - methodTx.put(m, new Byte(result));
> - return result;
> + Byte b = (Byte)methodTx.get(m);
> + if(b != null) return b.byteValue();
> +
> + BeanMetaData bmd = container.getBeanMetaData();
> + file://DEBUG Logger.log("Found metadata for bean
'"+bmd.getEjbName()+"'"+" method is "+m.getName());
> + byte result = bmd.getMethodTransactionType(m.getName(),
m.getParameterTypes(), remoteInvocation);
> +
> + // provide default if method is not found in descriptor
> + if (result == MetaData.TX_UNKNOWN) result =
MetaData.TX_REQUIRED;
> +
> + methodTx.put(m, new Byte(result));
> + return result;
> }
>
> // Inner classes -------------------------------------------------
> -
> +
> }
>
>
>
>
