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/tasks/ImportTask.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java
index 51e589f..7555636 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS
*/
package org.opends.server.tasks;
import org.opends.messages.Message;
@@ -1023,8 +1024,18 @@
}
DirectoryServer.notifyImportEnded(backend, importConfig, false);
- Message message =
- ERR_LDIFIMPORT_ERROR_DURING_IMPORT.get(de.getMessageObject());
+ Message message = null;
+ if (de.getResultCode() == ResultCode.CONSTRAINT_VIOLATION)
+ {
+ message =
+ ERR_LDIFIMPORT_ERROR_DURING_IMPORT
+ .get(ERR_LDIFIMPORT_ERROR_CONSTRAINT_VIOLATION.get());
+ }
+ else
+ {
+ message = ERR_LDIFIMPORT_ERROR_DURING_IMPORT.get(
+ de.getMessageObject());
+ }
logError(message);
return TaskState.STOPPED_BY_ERROR;
}
--
Gitblit v1.10.0