On Dec 3, 2008, at 6:11 AM, 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?
I don't know how the 2.1.1 branch got that name -- I think it's
supposed to be 2.1.
It should be in both branch and trunk since trunk is implementing
connector 1.6 spec and we may need the 1.5 spec for a while yet.
thanks
david jencks
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();
