From 5a76a2f3aa2e0356e134d67e7ef5e7eba1fa8efc Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 22 Jan 2008 14:22:11 +0000
Subject: [PATCH] Fix for issue 2859 (NPE when trying to import after (re)moving db).

---
 opends/src/server/org/opends/server/backends/jeb/BackendImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java b/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
index f1fc614..e435a9c 100644
--- a/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
+++ b/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
@@ -1252,8 +1252,11 @@
       // leave the backend in the same state.
       try
       {
-        rootContainer.close();
-        rootContainer = null;
+        if (rootContainer != null)
+        {
+          rootContainer.close();
+          rootContainer = null;
+        }
 
         // Sync the environment to disk.
         if (debugEnabled())

--
Gitblit v1.10.0