From 08b31449af699d4681a82d2f3decb3fada74cddf Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 09 Jun 2016 14:27:01 +0000
Subject: [PATCH] OPENDJ-3099 Report full stacktrace when import/rebuild fails
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
index 6833762..4c65bec 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
@@ -28,7 +28,6 @@
import java.util.List;
import java.util.Set;
import java.util.SortedSet;
-import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicInteger;
import org.forgerock.i18n.LocalizableMessage;
@@ -671,8 +670,8 @@
}
catch (Exception e)
{
- throw new DirectoryException(getServerErrorResultCode(), LocalizableMessage.raw(StaticUtils
- .stackTraceToSingleLineString(e, false)), e);
+ throw new DirectoryException(getServerErrorResultCode(),
+ LocalizableMessage.raw(StaticUtils.stackTraceToSingleLineString(e, true)), e);
}
finally
{
@@ -772,14 +771,6 @@
}
getImportStrategy(serverContext, rootContainer).rebuildIndex(rebuildConfig);
}
- catch (ExecutionException execEx)
- {
- throw new DirectoryException(getServerErrorResultCode(), ERR_EXECUTION_ERROR.get(execEx.getMessage()), execEx);
- }
- catch (InterruptedException intEx)
- {
- throw new DirectoryException(getServerErrorResultCode(), ERR_INTERRUPTED_ERROR.get(intEx.getMessage()), intEx);
- }
catch (ConfigException ce)
{
throw new DirectoryException(getServerErrorResultCode(), ce.getMessageObject(), ce);
@@ -792,10 +783,10 @@
{
throw e;
}
- catch (Exception ex)
+ catch (Exception e)
{
- throw new DirectoryException(getServerErrorResultCode(), LocalizableMessage.raw(stackTraceToSingleLineString(ex)),
- ex);
+ throw new DirectoryException(getServerErrorResultCode(),
+ LocalizableMessage.raw(StaticUtils.stackTraceToSingleLineString(e, true)), e);
}
finally
{
--
Gitblit v1.10.0