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 Wed, 09 Apr 2003 08:17:41 GMT
arminw      2003/04/09 01:17:41

  Modified:    src/java/org/apache/ojb/odmg J2EETransactionImpl.java
  Log:
  add version tag, remove out-commented lines
  
  Revision  Changes    Path
  1.18      +8 -54     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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- J2EETransactionImpl.java	14 Mar 2003 07:04:48 -0000	1.17
  +++ J2EETransactionImpl.java	9 Apr 2003 08:17:41 -0000	1.18
  @@ -55,6 +55,8 @@
    */
   /**
    * @author <a href="mailto:mattbaird@yahoo.com">Matthew Baird</a>
  + *
  + * @version $Id$
    */
   
   import javax.transaction.Status;
  @@ -133,60 +135,6 @@
        * FOR internal use. This method was called before the external transaction was completed.
        * @see javax.transaction.Synchronization
        */
  -//    public void beforeCompletion()
  -//    {
  -//        if (!m_isPrepared)
  -//        {
  -//            try
  -//            {
  -//                try
  -//                {
  -//                    JTATxManager mgr = (JTATxManager)TxManagerFactory.instance();
  -//                    if (mgr.getJTATransaction().getStatus() == Status.STATUS_MARKED_ROLLBACK)
  -//                    {
  -//                        abort();
  -//                    }
  -//                    else
  -//                    {
  -//                        this.prepare();
  -//                        commit();
  -//                    }
  -//                    /*
  -//                     * MBAIRD: hack to get around the lack of swizzling.
  -//                     */
  -//                    getBroker().clearCache();
  -//                }
  -//                catch (Throwable t)
  -//                {
  -//                    log.error(t);
  -//                    abort();
  -//    //                if (log.isDebugEnabled())
  -//    //                {
  -//    //                    log.debug(t.getMessage());
  -//    //                    t.printStackTrace();
  -//    //                }
  -//                }
  -//            }
  -//            finally
  -//            {
  -//                m_isPrepared = true;
  -//				try
  -//		        {
  -//		            doClose();
  -//		            setInExternTransaction(false);
  -//		        }
  -//		        catch (Throwable t)
  -//		        {
  -//		            if (log.isDebugEnabled())
  -//		            {
  -//		                log.debug(t.getMessage());
  -//		                t.printStackTrace();
  -//		            }
  -//		        }
  -//            }
  -//        }
  -//    }
  -
       public void beforeCompletion()
       {
           // avoid redundant calls
  @@ -207,6 +155,12 @@
                       {
                           prepare();
                           commit();
  +                        /*
  +                         MBAIRD: hack to get around the lack of swizzling.
  +                         arminw:
  +                         change the cache implementation to avoid swizzling
  +                         */
  +                        // getBroker().clearCache();
                       }
                       catch (Exception e)
                       {
  
  
  

Mime
View raw message