From 33a4c183706c508d76c82d054fc11c9862048a9f Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 28 Apr 2016 07:35:08 +0000
Subject: [PATCH] OPENDJ-2969 Improve error message
---
opendj-server-legacy/src/messages/org/opends/messages/replication.properties | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ReplicationEnvironment.java | 12 +++++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ReplicationEnvironment.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ReplicationEnvironment.java
index 500b6bf..c05faee 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ReplicationEnvironment.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ReplicationEnvironment.java
@@ -15,6 +15,9 @@
*/
package org.opends.server.replication.server.changelog.file;
+import static org.opends.messages.ReplicationMessages.*;
+import static org.opends.server.util.StaticUtils.*;
+
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
@@ -40,8 +43,6 @@
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
-import net.jcip.annotations.GuardedBy;
-
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -57,7 +58,7 @@
import org.opends.server.replication.server.changelog.file.Log.LogRotationParameters;
import org.opends.server.util.StaticUtils;
-import static org.opends.messages.ReplicationMessages.*;
+import net.jcip.annotations.GuardedBy;
/**
* Represents the replication environment, which allows to manage the lifecycle
@@ -372,8 +373,9 @@
}
catch (Exception e)
{
- throw new ChangelogException(
- ERR_CHANGELOG_UNABLE_TO_CREATE_REPLICA_DB.get(domainDN.toString(), serverId, generationId), e);
+ LocalizableMessage msg = ERR_CHANGELOG_UNABLE_TO_CREATE_REPLICA_DB.get(
+ domainDN, serverId, generationId, stackTraceToSingleLineString(e));
+ throw new ChangelogException(msg, e);
}
}
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/replication.properties b/opendj-server-legacy/src/messages/org/opends/messages/replication.properties
index 6aae643..f83bfb3 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/replication.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/replication.properties
@@ -496,7 +496,7 @@
changelog state from root path '%s' : IO error on domain directory '%s' when retrieving \
list of server ids
ERR_CHANGELOG_UNABLE_TO_CREATE_REPLICA_DB_244=Could not get or create replica DB \
- for baseDN '%s', serverId '%d', generationId '%d'
+ for baseDN '%s', serverId '%d', generationId '%d': %s
ERR_CHANGELOG_UNABLE_TO_CREATE_CN_INDEX_DB_245= Could not get or create change \
number index DB in root path '%s', using path '%s'
ERR_CHANGELOG_UNABLE_TO_DELETE_GENERATION_ID_FILE_246=Could not retrieve \
--
Gitblit v1.10.0