From f6f44d80e15b638b013a725396a8d7fe03031a1f Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Tue, 06 May 2008 22:12:59 +0000
Subject: [PATCH] Fixed an issue where a NPE could be thrown when the server processes a mod DN operation with a new superior entry thats in the subtree to be moved. An informative error message is added so the user can fix the mistake. 

---
 opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
index 85ce265..52ddf08 100644
--- a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
+++ b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
@@ -233,6 +233,13 @@
       }
       else
       {
+        if(newSuperior.isDescendantOf(entryDN))
+        {
+          setResultCode(ResultCode.UNWILLING_TO_PERFORM);
+          appendErrorMessage(ERR_MODDN_NEW_SUPERIOR_IN_SUBTREE.get(
+              String.valueOf(entryDN), String.valueOf(newSuperior)));
+          break modifyDNProcessing;
+        }
         parentDN = newSuperior;
       }
 

--
Gitblit v1.10.0