Mailing-List: contact dev-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@geronimo.apache.org
Received-SPF: pass (athena.apache.org: local policy)
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws;
  s=dk20050327; d=earthlink.net;
  b=fm0Uxcirb2yYxtW+Tw49pnG5A1Gu2/AERC0rCP3zH3dcZb+4L3590M6BcPK7QvLc;
  h=Received:Message-ID:Date:From:User-Agent:MIME-Version:To:Subject:References:In-Reply-To:Content-Type:Content-Transfer-Encoding:X-ELNK-Trace:X-Originating-IP;
Message-ID: <4935FAC9.7030708@earthlink.net>
Date: Tue, 02 Dec 2008 22:19:37 -0500
From: Joe Bohn <joe.bohn@earthlink.net>
User-Agent: Thunderbird 2.0.0.18 (Macintosh/20081105)
MIME-Version: 1.0
To: dev@geronimo.apache.org
Subject: Re: svn commit: r722725 - in
 /geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1.1/geronimo-transaction/src:
 main/java/org/apache/geronimo/transaction/manager/
 test/java/org/apache/geronimo/transaction/manager/
References: <20081203025112.2D12E238895F@eris.apache.org>
In-Reply-To: <20081203025112.2D12E238895F@eris.apache.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit

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

linsun@apache.org 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();
> 
> 
>