From 12300e9ede17e7c8b1e35436b88565b285c3fb70 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 03 Feb 2015 14:17:00 +0000
Subject: [PATCH] OPENDJ-1762 (CR-5923) verify-index on non existing index fails with NullPointerException when the server is stopped
---
opendj3-server-dev/src/server/org/opends/server/backends/persistit/PersistItStorage.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/persistit/PersistItStorage.java b/opendj3-server-dev/src/server/org/opends/server/backends/persistit/PersistItStorage.java
index df2b606..bee6283 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/persistit/PersistItStorage.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/persistit/PersistItStorage.java
@@ -592,7 +592,11 @@
}
catch (final StorageRuntimeException e)
{
- throw (Exception) e.getCause();
+ if (e.getCause() != null)
+ {
+ throw (Exception) e.getCause();
+ }
+ throw e;
}
finally
{
@@ -655,7 +659,11 @@
}
catch (final StorageRuntimeException e)
{
- throw (Exception) e.getCause();
+ if (e.getCause() != null)
+ {
+ throw (Exception) e.getCause();
+ }
+ throw e;
}
finally
{
--
Gitblit v1.10.0