From 2d13862af451882e06a892347cab630304a9455c 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
---
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/DeleteMsg.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/DeleteMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/DeleteMsg.java
index 9a1c734..b65f548 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/DeleteMsg.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/DeleteMsg.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2012 ForgeRock AS
*/
package org.opends.server.replication.protocol;
@@ -75,11 +75,11 @@
* @param dn The dn with which the message must be created.
* @param changeNumber The change number with which the message must be
* created.
- * @param uid The unique id with which the message must be created.
+ * @param entryUUID The unique id with which the message must be created.
*/
- public DeleteMsg(String dn, ChangeNumber changeNumber, String uid)
+ public DeleteMsg(String dn, ChangeNumber changeNumber, String entryUUID)
{
- super(new DeleteContext(changeNumber, uid), dn);
+ super(new DeleteContext(changeNumber, entryUUID), dn);
}
/**
@@ -124,7 +124,7 @@
if (isSubtreeDelete)
del.addRequestControl(new SubtreeDeleteControl(false));
- DeleteContext ctx = new DeleteContext(getChangeNumber(), getUniqueId());
+ DeleteContext ctx = new DeleteContext(getChangeNumber(), getEntryUUID());
del.setAttachment(SYNCHROCONTEXT, ctx);
return del;
}
@@ -256,7 +256,7 @@
" protocolVersion: " + protocolVersion +
" dn: " + dn +
" changeNumber: " + changeNumber +
- " uniqueId: " + uniqueId +
+ " uniqueId: " + entryUUID +
" assuredFlag: " + assuredFlag;
}
if (protocolVersion >= ProtocolVersion.REPLICATION_PROTOCOL_V2)
@@ -265,7 +265,7 @@
" protocolVersion: " + protocolVersion +
" dn: " + dn +
" changeNumber: " + changeNumber +
- " uniqueId: " + uniqueId +
+ " uniqueId: " + entryUUID +
" assuredFlag: " + assuredFlag +
" assuredMode: " + assuredMode +
" safeDataLevel: " + safeDataLevel;
--
Gitblit v1.10.0