You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by mi...@apache.org on 2013/07/10 04:14:31 UTC
svn commit: r1501634 - in
/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/ee:
AutomaticManagedRuntime.java RegistryManagedRuntime.java
Author: mikedd
Date: Wed Jul 10 02:14:30 2013
New Revision: 1501634
URL: http://svn.apache.org/r1501634
Log:
OPENJPA-696: Make transaction synchronization registries non-static.
Patch is old - feel free to revert if something breaks.
Modified:
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/ee/RegistryManagedRuntime.java
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java?rev=1501634&r1=1501633&r2=1501634&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java Wed Jul 10 02:14:30 2013
@@ -74,16 +74,16 @@ public class AutomaticManagedRuntime ext
+ "getTransactionManagerImpl", // borland
};
- private static final ManagedRuntime REGISTRY;
- private static final WLSManagedRuntime WLS;
- private static final SunOneManagedRuntime SUNONE;
- private static final WASManagedRuntime WAS;
- private static final WASRegistryManagedRuntime WAS_REG;
+ private final ManagedRuntime REGISTRY;
+ private final WLSManagedRuntime WLS;
+ private final SunOneManagedRuntime SUNONE;
+ private final WASManagedRuntime WAS;
+ private final WASRegistryManagedRuntime WAS_REG;
private static Localizer _loc = Localizer.forPackage
(AutomaticManagedRuntime.class);
- static {
+ public AutomaticManagedRuntime() {
ManagedRuntime mr = null;
mr = null;
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/ee/RegistryManagedRuntime.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/ee/RegistryManagedRuntime.java?rev=1501634&r1=1501633&r2=1501634&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/ee/RegistryManagedRuntime.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/ee/RegistryManagedRuntime.java Wed Jul 10 02:14:30 2013
@@ -101,7 +101,7 @@ public class RegistryManagedRuntime
*
* @author Marc Prud'hommeaux
*/
- public static class TransactionManagerRegistryFacade
+ public class TransactionManagerRegistryFacade
implements TransactionManager, Transaction {
private final TransactionSynchronizationRegistry _registry;