From 75a710630a2d6271231a31eed5fa72fccfcb8723 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Mon, 10 Jun 2013 12:46:50 +0000
Subject: [PATCH] CR-1816 OPENDJ-940 Import-ldif NPE if base entry contains invalid attribute values and skipDNValidation is set - Removed NullPointerException message and it sends now a DirectoryException.
---
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
index 5e104a7..8f9ef2a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
@@ -1158,9 +1158,16 @@
{
TRACER.debugCaught(DebugLogLevel.ERROR, execEx);
}
- Message message = ERR_EXECUTION_ERROR.get(execEx.getMessage());
- throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
- message);
+ if (execEx.getCause() instanceof DirectoryException)
+ {
+ throw ((DirectoryException) execEx.getCause());
+ }
+ else
+ {
+ Message message = ERR_EXECUTION_ERROR.get(execEx.getMessage());
+ throw new DirectoryException(
+ DirectoryServer.getServerErrorResultCode(), message);
+ }
}
catch (InterruptedException intEx)
{
--
Gitblit v1.10.0