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/OperationContext.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/protocol/OperationContext.java b/opends/src/server/org/opends/server/replication/protocol/OperationContext.java
index 6c2aa96..4185cf1 100644
--- a/opends/src/server/org/opends/server/replication/protocol/OperationContext.java
+++ b/opends/src/server/org/opends/server/replication/protocol/OperationContext.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions copyright 2012 ForgeRock AS.
*/
package org.opends.server.replication.protocol;
@@ -49,17 +50,17 @@
/**
* The unique Id of the entry that was modified in the original operation.
*/
- private String entryUid;
+ private String entryUUID;
/**
* Create a new OperationContext.
* @param changeNumber The change number of the operation.
- * @param uid The unique Identifier of the modified entry.
+ * @param entryUUID The unique Identifier of the modified entry.
*/
- protected OperationContext(ChangeNumber changeNumber, String uid)
+ protected OperationContext(ChangeNumber changeNumber, String entryUUID)
{
this.changeNumber = changeNumber;
- this.entryUid = uid;
+ this.entryUUID = entryUUID;
}
/**
@@ -77,9 +78,9 @@
*
* @return the unique Identifier of the modified entry.
*/
- public String getEntryUid()
+ public String getEntryUUID()
{
- return entryUid;
+ return entryUUID;
}
/**
@@ -129,7 +130,7 @@
{
OperationContext ctx = (OperationContext) obj;
return ((this.changeNumber.equals(ctx.getChangeNumber()) &&
- (this.entryUid.equals(ctx.getEntryUid()))));
+ (this.entryUUID.equals(ctx.getEntryUUID()))));
}
else
return false;
@@ -141,7 +142,7 @@
@Override
public int hashCode()
{
- return changeNumber.hashCode() + entryUid.hashCode();
+ return changeNumber.hashCode() + entryUUID.hashCode();
}
--
Gitblit v1.10.0