Return-Path: Delivered-To: apmail-db-ojb-dev-archive@www.apache.org Received: (qmail 62366 invoked from network); 3 Apr 2005 02:59:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Apr 2005 02:59:50 -0000 Received: (qmail 80236 invoked by uid 500); 3 Apr 2005 02:59:50 -0000 Delivered-To: apmail-db-ojb-dev-archive@db.apache.org Received: (qmail 80213 invoked by uid 500); 3 Apr 2005 02:59:50 -0000 Mailing-List: contact ojb-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "OJB Developers List" Reply-To: "OJB Developers List" Delivered-To: mailing list ojb-dev@db.apache.org Received: (qmail 80200 invoked by uid 500); 3 Apr 2005 02:59:50 -0000 Received: (qmail 80193 invoked by uid 99); 3 Apr 2005 02:59:49 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sat, 02 Apr 2005 18:59:49 -0800 Received: (qmail 62353 invoked by uid 1510); 3 Apr 2005 02:59:48 -0000 Date: 3 Apr 2005 02:59:48 -0000 Message-ID: <20050403025948.62352.qmail@minotaur.apache.org> From: arminw@apache.org To: db-ojb-cvs@apache.org Subject: cvs commit: db-ojb/src/java/org/apache/ojb/odmg J2EETransactionImpl.java X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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