From dfe6772274d4642b2c332740ea6f65550b8cb855 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <ylecaillez@forgerock.com>
Date: Mon, 05 Oct 2015 09:43:32 +0000
Subject: [PATCH] Fix: Ensure latch is released if beforeImport() throws.
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java
index ae16c45..bd9ce3e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java
@@ -719,8 +719,14 @@
final CountDownLatch newLatch = new CountDownLatch(1);
if (importedContainers.putIfAbsent(container, newLatch) == null)
{
- importStrategy.beforeImport(container);
- newLatch.countDown();
+ try
+ {
+ importStrategy.beforeImport(container);
+ }
+ finally
+ {
+ newLatch.countDown();
+ }
}
latch = importedContainers.get(container);
}
--
Gitblit v1.10.0