From 14ba2a5582a448b3de3cc1eb789ff572cd62520d Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 25 Nov 2015 15:10:41 +0000
Subject: [PATCH] Fix deadlock in JE Storage when running unit tests
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java | 4 ----
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java | 4 ++++
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java
index 6194069..7209857 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java
@@ -521,6 +521,10 @@
}
catch (DatabaseNotFoundException e)
{
+ // This is fine: end result is what we wanted
+ }
+ catch (DatabaseException e)
+ {
throw new StorageRuntimeException(e);
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
index 99dcdd0..1ac5c03 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
@@ -2508,10 +2508,6 @@
for (Tree tree : listTrees())
{
tree.delete(txn);
- if (tree instanceof Index)
- {
- ((Index) tree).setTrusted(txn, true);
- }
}
}
});
--
Gitblit v1.10.0