From d9b25027df56c50a18889028833894db2a7b5ac8 Mon Sep 17 00:00:00 2001
From: Johann Werner <jw@oyosys.de>
Date: Sun, 18 Nov 2012 23:29:54 +0100
Subject: [PATCH] use ReentrantLock instead of NSRecursiveLock

---
 .../er/extensions/eof/ERXAdaptorOperationWrapper.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXAdaptorOperationWrapper.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXAdaptorOperationWrapper.java
index b0e8cc364a0..24c9f63cf0e 100644
--- a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXAdaptorOperationWrapper.java
+++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXAdaptorOperationWrapper.java
@@ -1,6 +1,7 @@
 package er.extensions.eof;
 
 import java.io.Serializable;
+import java.util.concurrent.locks.ReentrantLock;
 
 import org.apache.log4j.Logger;
 
@@ -18,7 +19,6 @@
 import com.webobjects.foundation.NSDictionary;
 import com.webobjects.foundation.NSMutableArray;
 import com.webobjects.foundation.NSNotificationCenter;
-import com.webobjects.foundation.NSRecursiveLock;
 
 import er.extensions.foundation.ERXProperties;
 
@@ -41,7 +41,7 @@ public class ERXAdaptorOperationWrapper implements Serializable {
 
     public static final Logger log = Logger.getLogger(ERXAdaptorOperationWrapper.class);
 
-    public static final NSRecursiveLock adaptorOperationsLock = new NSRecursiveLock();
+    public static final ReentrantLock adaptorOperationsLock = new ReentrantLock();
     
     public static final String AdaptorOperationsDidPerformNotification = "AdaptorOperationsDidPerform";
     
@@ -111,10 +111,10 @@ public static void performWrappedAdaptorOperations(NSArray ops) {
             EODatabaseContext context = EOUtilities.databaseContextForModelNamed(ec, op.operation().entity().model().name());
             context.lock();
             adaptorOperationsLock.lock();
-            EODatabaseChannel dchannel = context.availableChannel();
-            EOAdaptorChannel achannel = dchannel.adaptorChannel();
-            achannel.adaptorContext().beginTransaction();
             try {
+                EODatabaseChannel dchannel = context.availableChannel();
+                EOAdaptorChannel achannel = dchannel.adaptorChannel();
+                achannel.adaptorContext().beginTransaction();
                 boolean wasOpen = achannel.isOpen();
                 if (!wasOpen) {
                     achannel.openChannel();