db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arm...@apache.org
Subject cvs commit: db-ojb/src/java/org/apache/ojb/odmg J2EETransactionImpl.java
Date Sun, 03 Apr 2005 02:59:48 GMT
arminw      2005/04/02 18:59:48

  Modified:    src/java/org/apache/ojb/odmg Tag: OJB_1_0_RELEASE
                        J2EETransactionImpl.java
  Log:
  rollback
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.25.2.6  +1 -31     db-ojb/src/java/org/apache/ojb/odmg/J2EETransactionImpl.java
  
  Index: J2EETransactionImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/J2EETransactionImpl.java,v
  retrieving revision 1.25.2.5
  retrieving revision 1.25.2.6
  diff -u -r1.25.2.5 -r1.25.2.6
  --- J2EETransactionImpl.java	3 Apr 2005 02:38:45 -0000	1.25.2.5
  +++ J2EETransactionImpl.java	3 Apr 2005 02:59:48 -0000	1.25.2.6
  @@ -19,8 +19,6 @@
   import javax.transaction.Synchronization;
   
   import org.apache.ojb.broker.PersistenceBroker;
  -import org.apache.ojb.broker.core.DelegatingPersistenceBroker;
  -import org.apache.ojb.broker.core.PersistenceBrokerImpl;
   import org.apache.ojb.broker.accesslayer.ConnectionManagerIF;
   import org.apache.ojb.broker.util.logging.Logger;
   import org.apache.ojb.broker.util.logging.LoggerFactory;
  @@ -56,14 +54,7 @@
       public void setInExternTransaction(boolean mode)
       {
           isInExternTransaction = mode;
  -        if(mode)
  -        {
  -            // TODO: avoid this ugly cast
  -            // signal the PB instance that OJB run in a JTA tx
  -            PersistenceBrokerImpl broker = (PersistenceBrokerImpl) ((DelegatingPersistenceBroker)
getBroker()).getInnermostDelegate();
  -            broker.setManaged(true);
           }
  -    }
   
       public boolean isInExternTransaction()
       {
  @@ -72,39 +63,18 @@
   
       public void join()
       {
  -        if(isInExternTransaction())
  -        {
               throw new UnsupportedOperationException("Not supported in managed enviroment");
           }
  -        else
  -        {
  -            super.join();
  -        }
  -    }
   
       public void leave()
       {
  -        if(isInExternTransaction())
  -        {
               throw new UnsupportedOperationException("Not supported in managed enviroment");
           }
  -        else
  -        {
  -            super.leave();
  -        }
  -    }
   
       public void checkpoint()
       {
  -        if(isInExternTransaction())
  -        {
               throw new UnsupportedOperationException("Not supported in managed enviroment");
           }
  -        else
  -        {
  -            super.checkpoint();
  -        }
  -    }
   
       /**
        * FOR internal use. This method was called after the external transaction was completed.
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org


Mime
View raw message