From c8b1165dbfbee716e8163f42301c650b370248af Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 21 Feb 2012 15:49:01 +0000
Subject: [PATCH] Initial cleanup work for OPENDJ-181: DirectoryException provided value has an invalid length for a UUID

---
 opends/src/server/org/opends/server/replication/server/ReplicationBackend.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java b/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java
index acb95b5..3253baf 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java
@@ -23,7 +23,7 @@
  *
  *
  *      Copyright 2007-2009 Sun Microsystems, Inc.
- *      Portions copyright 2011 ForgeRock AS
+ *      Portions copyright 2011-2012 ForgeRock AS
  */
 package org.opends.server.replication.server;
 import static org.opends.messages.BackendMessages.*;
@@ -871,7 +871,7 @@
           AddMsg addMsg = (AddMsg)msg;
           AddOperation addOperation = (AddOperation)msg.createOperation(conn);
 
-          dn = DN.decode("puid=" + addMsg.getParentUid() + "+" +
+          dn = DN.decode("puid=" + addMsg.getParentEntryUUID() + "+" +
               CHANGE_NUMBER + "=" + msg.getChangeNumber().toString() + "+" +
               msg.getDn() + "," + BASE_DN);
 
@@ -922,7 +922,7 @@
         {
           DeleteMsg delMsg = (DeleteMsg)msg;
 
-          dn = DN.decode("uuid=" + msg.getUniqueId() + "," +
+          dn = DN.decode("uuid=" + msg.getEntryUUID() + "," +
               CHANGE_NUMBER + "=" + delMsg.getChangeNumber().toString()+ "," +
               msg.getDn() +","+ BASE_DN);
 
@@ -945,7 +945,7 @@
         {
           ModifyOperation op = (ModifyOperation)msg.createOperation(conn);
 
-          dn = DN.decode("uuid=" + msg.getUniqueId() + "," +
+          dn = DN.decode("uuid=" + msg.getEntryUUID() + "," +
               CHANGE_NUMBER + "=" + msg.getChangeNumber().toString()+ "," +
               msg.getDn() +","+ BASE_DN);
           op.setInternalOperation(true);
@@ -969,7 +969,7 @@
         {
           ModifyDNOperation op = (ModifyDNOperation)msg.createOperation(conn);
 
-          dn = DN.decode("uuid=" + msg.getUniqueId() + "," +
+          dn = DN.decode("uuid=" + msg.getEntryUUID() + "," +
               CHANGE_NUMBER + "=" + msg.getChangeNumber().toString()+ "," +
               msg.getDn() +","+ BASE_DN);
           op.setInternalOperation(true);

--
Gitblit v1.10.0