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/protocol/ModifyMsg.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/protocol/ModifyMsg.java b/opends/src/server/org/opends/server/replication/protocol/ModifyMsg.java
index daae6dc..e2ca106 100644
--- a/opends/src/server/org/opends/server/replication/protocol/ModifyMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/ModifyMsg.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;
@@ -69,13 +69,13 @@
* @param changeNumber The ChangeNumber for the operation.
* @param dn The baseDN of the operation.
* @param mods The mod of the operation.
- * @param entryuuid The unique id of the entry on which the modification
+ * @param entryUUID The unique id of the entry on which the modification
* needs to apply.
*/
public ModifyMsg(ChangeNumber changeNumber, DN dn, List<Modification> mods,
- String entryuuid)
+ String entryUUID)
{
- super(new ModifyContext(changeNumber, entryuuid),
+ super(new ModifyContext(changeNumber, entryUUID),
dn.toNormalizedString());
this.encodedMods = encodeMods(mods);
}
@@ -146,7 +146,7 @@
InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(), null,
ByteString.valueOf(newDn), ldapmods);
- ModifyContext ctx = new ModifyContext(getChangeNumber(), getUniqueId());
+ ModifyContext ctx = new ModifyContext(getChangeNumber(), getEntryUUID());
mod.setAttachment(SYNCHROCONTEXT, ctx);
return mod;
@@ -165,7 +165,7 @@
" protocolVersion: " + protocolVersion +
" dn: " + dn +
" changeNumber: " + changeNumber +
- " uniqueId: " + uniqueId +
+ " uniqueId: " + entryUUID +
" assuredFlag: " + assuredFlag;
}
if (protocolVersion >= ProtocolVersion.REPLICATION_PROTOCOL_V2)
@@ -191,7 +191,7 @@
" protocolVersion: " + protocolVersion +
" dn: " + dn +
" changeNumber: " + changeNumber +
- " uniqueId: " + uniqueId +
+ " uniqueId: " + entryUUID +
" assuredFlag: " + assuredFlag +
" assuredMode: " + assuredMode +
" safeDataLevel: " + safeDataLevel +
--
Gitblit v1.10.0