From 1edd5068bf0b63cbd67c615942ad5c545440d476 Mon Sep 17 00:00:00 2001
From: abobrov <abobrov@localhost>
Date: Tue, 24 Nov 2009 15:14:33 +0000
Subject: [PATCH] - upgrade to BDB JE 4 [ 4.0.73 ]
---
opends/src/server/org/opends/server/replication/server/ReplicationDB.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationDB.java b/opends/src/server/org/opends/server/replication/server/ReplicationDB.java
index a86bb11..0e045bc 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationDB.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationDB.java
@@ -42,7 +42,7 @@
import com.sleepycat.je.DatabaseEntry;
import com.sleepycat.je.DatabaseException;
import com.sleepycat.je.Database;
-import com.sleepycat.je.DeadlockException;
+import com.sleepycat.je.LockConflictException;
import com.sleepycat.je.LockMode;
import com.sleepycat.je.OperationStatus;
import com.sleepycat.je.Transaction;
@@ -130,7 +130,7 @@
txn = null;
done = true;
}
- catch (DeadlockException e)
+ catch (LockConflictException e)
{
if (txn != null)
txn.abort();
@@ -535,7 +535,7 @@
closeLockedCursor(cursor);
cursor = null;
}
- catch (DeadlockException e1)
+ catch (LockConflictException e1)
{
// The DB documentation states that a DeadlockException
// on the close method of a cursor that is aborting should
--
Gitblit v1.10.0