From 76159518846a6aee0d205624b00f93a83f4aeff2 Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Wed, 17 Jun 2015 09:49:32 +0000
Subject: [PATCH] OPENDJ-2148 CR-7287 "NullPointerException" when running import-ldif online with exclude branch
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java | 6 ++++++
1 files changed, 6 insertions(+), 0 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 c1567c0..e27d70c 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
@@ -664,6 +664,12 @@
{
throw new DirectoryException(getServerErrorResultCode(), ERR_IMPORT_BACKEND_ONLINE.get());
}
+ if (importIncludesOrExcludesBranches(cfg.getBaseDN(), importConfig.getIncludeBranches(),
+ importConfig.getExcludeBranches()))
+ {
+ // fail-fast to avoid ending up in an unrecoverable state for the server
+ throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, ERR_IMPORT_UNSUPPORTED_WITH_BRANCH.get());
+ }
try
{
--
Gitblit v1.10.0