Return-Path: Delivered-To: apmail-incubator-geronimo-cvs-archive@www.apache.org Received: (qmail 90338 invoked from network); 7 Apr 2004 23:38:20 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 7 Apr 2004 23:38:20 -0000 Received: (qmail 42703 invoked by uid 500); 7 Apr 2004 23:38:04 -0000 Delivered-To: apmail-incubator-geronimo-cvs-archive@incubator.apache.org Received: (qmail 42682 invoked by uid 500); 7 Apr 2004 23:38:04 -0000 Mailing-List: contact geronimo-cvs-help@incubator.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: geronimo-dev@incubator.apache.org Delivered-To: mailing list geronimo-cvs@incubator.apache.org Received: (qmail 42668 invoked from network); 7 Apr 2004 23:38:04 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 7 Apr 2004 23:38:04 -0000 Received: (qmail 90320 invoked by uid 1711); 7 Apr 2004 23:38:18 -0000 Date: 7 Apr 2004 23:38:18 -0000 Message-ID: <20040407233818.90319.qmail@minotaur.apache.org> From: dain@apache.org To: incubator-geronimo-cvs@apache.org Subject: cvs commit: incubator-geronimo/modules/transaction/src/java/org/apache/geronimo/transaction UserTransactionImpl.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N dain 2004/04/07 16:38:18 Modified: modules/transaction/src/java/org/apache/geronimo/transaction UserTransactionImpl.java Log: Removed requirement that tracked connection associater not be null; in openejb the tracked connection associater will be null for legacy clients Revision Changes Path 1.3 +8 -5 incubator-geronimo/modules/transaction/src/java/org/apache/geronimo/transaction/UserTransactionImpl.java Index: UserTransactionImpl.java =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/transaction/src/java/org/apache/geronimo/transaction/UserTransactionImpl.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- UserTransactionImpl.java 6 Apr 2004 18:33:36 -0000 1.2 +++ UserTransactionImpl.java 7 Apr 2004 23:38:18 -0000 1.3 @@ -131,10 +131,13 @@ throw e; } TransactionContext.setContext(newContext); - try { - trackedConnectionAssociator.newTransaction(); - } catch (ResourceException e) { - throw (SystemException)new SystemException().initCause(e); + + if(trackedConnectionAssociator != null) { + try { + trackedConnectionAssociator.newTransaction(); + } catch (ResourceException e) { + throw (SystemException)new SystemException().initCause(e); + } } }