From 5bb8041f09a8dd5c1b769b08b2188caee41758bf Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 23 Apr 2013 10:22:34 +0000
Subject: [PATCH] Fix OPENDJ-625: ModifyDN does not allow the same (normalized) DN
---
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
index 64ebea0..9f4adcc 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
@@ -24,6 +24,7 @@
*
* Copyright 2006-2010 Sun Microsystems, Inc.
* Portions Copyright 2011-2013 ForgeRock AS
+ * Portions copyright 2013 Manuel Gaupp
*/
package org.opends.server.backends.jeb;
import org.opends.messages.Message;
@@ -2428,7 +2429,8 @@
try
{
// Check whether the renamed entry already exists.
- if (dn2id.get(txn, entry.getDN(), LockMode.DEFAULT) != null)
+ if (!currentDN.equals(entry.getDN()) &&
+ dn2id.get(txn, entry.getDN(), LockMode.DEFAULT) != null)
{
Message message = ERR_JEB_MODIFYDN_ALREADY_EXISTS.get(
entry.getDN().toString());
--
Gitblit v1.10.0