From 67a85ae92e7f4e7fb3d95ddd18a9626c64212c68 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Fri, 16 Sep 2016 08:03:50 +0000
Subject: [PATCH] OPENDJ-3286: import-ldif prints missleading message when fail
---
opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
index c19d5c2..87a0506 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
@@ -863,9 +863,14 @@
}
catch (DirectoryException de)
{
- LocalizableMessage msg;
- msg = de.getMessageObject();
- logger.error(ERR_LDIFIMPORT_ERROR_DURING_IMPORT.get(msg));
+ if (de.getResultCode().equals(DirectoryServer.getServerErrorResultCode()))
+ {
+ logger.error(ERR_LDIFIMPORT_ERROR_DURING_IMPORT.get(de.getMessageObject()));
+ }
+ else
+ {
+ logger.error(de.getMessageObject());
+ }
retCode = 1;
}
catch (Exception e)
--
Gitblit v1.10.0