From 1ef65104c4113a1c6fad7ee93bc9862218a4bc68 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 16 Feb 2015 14:10:23 +0000
Subject: [PATCH] AutoRefactor: common code in if else statements
---
opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
index ea5a110..ff8943c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -1224,19 +1224,13 @@
DN valueEntryDN = DN.decode(attrVal);
final Entry valueEntry;
- if (currentConfiguration.getCheckReferencesScopeCriteria() == CheckReferencesScopeCriteria.NAMING_CONTEXT)
+ if (currentConfiguration.getCheckReferencesScopeCriteria() == CheckReferencesScopeCriteria.NAMING_CONTEXT
+ && valueEntryDN.matchesBaseAndScope(entryBaseDN, SearchScope.SUBORDINATES))
{
- if (valueEntryDN.matchesBaseAndScope(entryBaseDN, SearchScope.SUBORDINATES))
- {
- return PluginResult.PreOperation.stopProcessing(ResultCode.CONSTRAINT_VIOLATION,
- ERR_PLUGIN_REFERENT_NAMINGCONTEXT_MISMATCH.get(valueEntryDN, attr.getName(), entryDN));
- }
- valueEntry = DirectoryServer.getEntry(valueEntryDN);
+ return PluginResult.PreOperation.stopProcessing(ResultCode.CONSTRAINT_VIOLATION,
+ ERR_PLUGIN_REFERENT_NAMINGCONTEXT_MISMATCH.get(valueEntryDN, attr.getName(), entryDN));
}
- else
- {
- valueEntry = DirectoryServer.getEntry(valueEntryDN);
- }
+ valueEntry = DirectoryServer.getEntry(valueEntryDN);
// Verify that the value entry exists in the backend.
if (valueEntry == null)
--
Gitblit v1.10.0