I just renamed the branch and pulled rev 704747 into branch 2.1. Thanks. Lin
On Wed, Dec 3, 2008 at 9:56 PM, David Jencks <[EMAIL PROTECTED]> wrote: > Hi Lin, > > thinking back maybe the branches/2.1.1 was a mistaken leftover from a tag... > :-\ > > Anyway before starting on the connector 1.6 stuff in trunk I changed logging > over to slf4j. It would be great if you could get this change into the > 2.1.2 I think you are proposing. > > rev 704747 on geronimo/components/txmanager/trunk October 14. > > many thanks > david jencks > > On Dec 3, 2008, at 6:28 PM, Lin Sun wrote: > >> Hi Joe, do you mean these questions? >> >> - Where is the new testTransactionKey() method used that was added here >> and >> in trunk? >> - Is this something that we need to consider including with Geronimo 2.2? >> >> >> Sorry I think I sorta answered them. The testTransactionKey() method >> was added here in trunk - >> >> https://svn.apache.org/repos/asf/geronimo/components/txmanager/trunk/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/manager/TransactionSynchronizationRegistryTest.java. >> This is a test method so it is only used when test is running. :) >> >> G 2.2 is currently configured to use txmanager 2.1.1. I think I am >> going to have a few other changes on txmanager, so I am not sure if I >> can get all these in time for G 2.2. If I can get a txmanager >> released (with all the changes I want) + pass the tck, I think G 2.2 >> should pick up the newer version of txmanager. >> >> Lin >> >> On Wed, Dec 3, 2008 at 5:08 PM, Joe Bohn <[EMAIL PROTECTED]> wrote: >>> >>> Any answers to the other questions below? >>> >>> Thanks, >>> Joe >>> >>> Lin Sun wrote: >>>> >>>> Hi Joe, >>>> >>>> Thanks for the review! >>>> >>>> There is a 2.1.1 tag here - >>>> >>>> >>>> http://svn.apache.org/viewvc/geronimo/components/txmanager/tags/geronimo-txmanager-parent-2.1.1/ >>>> >>>> So I checked code into branch/2.1.1 for the change to be included in >>>> txmanager 2.1.2. I also checked the code into txmanager trunk (see >>>> rev 722724) for the change to be included in txmanager 2.2. >>>> Basically I am just following what we do with G server 2.1 branch and >>>> 2.2 trunk. Now that you question this, I am thinking should not the >>>> branch be called 2.1 instead of 2.1.1? Or maybe we should just check >>>> code into txmanager trunk? >>>> >>>> Lin >>>> >>>> >>>> On Tue, Dec 2, 2008 at 10:19 PM, Joe Bohn <[EMAIL PROTECTED]> >>>> wrote: >>>>> >>>>> Hi Lin, >>>>> >>>>> A few questions: >>>>> >>>>> - Why modify branches/2.1.1? I'm not sure, but it looks like this is >>>>> an >>>>> old >>>>> branch that was subsequently copied to tags/2.1.1 (rather than moved to >>>>> tags). >>>>> - Where is the new testTransactionKey() method used that was added here >>>>> and >>>>> in trunk? >>>>> - Is this something that we need to consider including with Geronimo >>>>> 2.2? >>>>> >>>>> Joe >>>>> >>>>> [EMAIL PROTECTED] wrote: >>>>>> >>>>>> Author: linsun >>>>>> Date: Tue Dec 2 18:51:11 2008 >>>>>> New Revision: 722725 >>>>>> >>>>>> URL: http://svn.apache.org/viewvc?rev=722725&view=rev >>>>>> Log: >>>>>> GERONIMO-4438 - TransactionSynchronizationRegistry.getTransactionKey >>>>>> should return null when transaction is not associated with the current >>>>>> thread >>>>>> >>>>>> Modified: >>>>>> >>>>>> >>>>>> >>>>>> geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java >>>>>> >>>>>> >>>>>> >>>>>> geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1.1/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/manager/TransactionSynchronizationRegistryTest.java >>>>>> >>>>>> Modified: >>>>>> >>>>>> >>>>>> geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java >>>>>> URL: >>>>>> >>>>>> >>>>>> http://svn.apache.org/viewvc/geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java?rev=722725&r1=722724&r2=722725&view=diff >>>>>> >>>>>> >>>>>> >>>>>> ============================================================================== >>>>>> --- >>>>>> >>>>>> >>>>>> geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java >>>>>> (original) >>>>>> +++ >>>>>> >>>>>> >>>>>> geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java >>>>>> Tue Dec 2 18:51:11 2008 >>>>>> @@ -205,8 +205,8 @@ >>>>>> } >>>>>> public Object getTransactionKey() { >>>>>> - TransactionImpl tx = getActiveTransactionImpl(); >>>>>> - return tx.getTransactionKey(); >>>>>> + TransactionImpl tx = (TransactionImpl) getTransaction(); >>>>>> + return tx == null ? null: tx.getTransactionKey(); >>>>>> } >>>>>> public int getTransactionStatus() { >>>>>> >>>>>> Modified: >>>>>> >>>>>> >>>>>> geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1.1/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/manager/TransactionSynchronizationRegistryTest.java >>>>>> URL: >>>>>> >>>>>> >>>>>> http://svn.apache.org/viewvc/geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1.1/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/manager/TransactionSynchronizationRegistryTest.java?rev=722725&r1=722724&r2=722725&view=diff >>>>>> >>>>>> >>>>>> >>>>>> ============================================================================== >>>>>> --- >>>>>> >>>>>> >>>>>> geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1.1/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/manager/TransactionSynchronizationRegistryTest.java >>>>>> (original) >>>>>> +++ >>>>>> >>>>>> >>>>>> geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1.1/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/manager/TransactionSynchronizationRegistryTest.java >>>>>> Tue Dec 2 18:51:11 2008 >>>>>> @@ -57,6 +57,15 @@ >>>>>> tm.getTransaction().registerSynchronization(normalSync); >>>>>> } >>>>>> + public void testTransactionKey() throws Exception { >>>>>> + normalSync = new CountingSync(); >>>>>> + assertNull(tm.getTransactionKey()); >>>>>> + setUpInterposedSync(); >>>>>> + tm.getTransaction().registerSynchronization(normalSync); >>>>>> + assertNotNull(tm.getTransactionKey()); >>>>>> + tm.commit(); >>>>>> + assertNull(tm.getTransactionKey()); >>>>>> + } >>>>>> public void testInterposedSynchIsCalledOnCommit() throws Exception >>>>>> { >>>>>> setUpInterposedSync(); >>>>>> >>>>>> >>>>>> >>>>> >>>> >>> >>> > >
