From 0b6ab457f704afb95fc3d8389d50bf951eb9353e Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 24 Aug 2015 07:59:10 +0000
Subject: [PATCH] HistAttrModificationKey.java: Renamed DELATTR to ATTRDEL to match string representation.
---
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalSingle.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalMultiple.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistAttrModificationKey.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalAttributeValue.java | 7 +++----
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalMultiple.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalMultiple.java
index 17ef637..036ea9e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalMultiple.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalMultiple.java
@@ -611,7 +611,7 @@
}
break;
- case DELATTR:
+ case ATTRDEL:
delete(csn);
break;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalSingle.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalSingle.java
index 3f25305..15e19f1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalSingle.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalSingle.java
@@ -297,7 +297,7 @@
}
break;
- case DELATTR:
+ case ATTRDEL:
this.deleteTime = csn;
break;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistAttrModificationKey.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistAttrModificationKey.java
index 1f5439c..39f2298 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistAttrModificationKey.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistAttrModificationKey.java
@@ -41,7 +41,7 @@
/** The key for attribute value deletion. */
DEL("del"),
/** The key for attribute deletion. */
- DELATTR("attrDel"),
+ ATTRDEL("attrDel"),
/** The key for attribute replace. */
REPL("repl"),
/** The key for attribute value addition. */
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalAttributeValue.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalAttributeValue.java
index 531d4ec..9af07c7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalAttributeValue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalAttributeValue.java
@@ -133,7 +133,7 @@
csn = new CSN(token[1]);
histKey = HistAttrModificationKey.decodeKey(token[2]);
- if (histKey != DELATTR)
+ if (histKey != ATTRDEL)
{
if (token.length == 4)
{
@@ -222,7 +222,7 @@
AttributeBuilder builder = new AttributeBuilder(attrType, attrString);
builder.setOptions(options);
- if (histKey != DELATTR)
+ if (histKey != ATTRDEL)
{
builder.add(attributeValue);
}
@@ -233,11 +233,10 @@
case ADD:
return new Modification(ModificationType.ADD, attr);
case DEL:
+ case ATTRDEL:
return new Modification(ModificationType.DELETE, attr);
case REPL:
return new Modification(ModificationType.REPLACE, attr);
- case DELATTR:
- return new Modification(ModificationType.DELETE, attr);
default:
return null;
}
--
Gitblit v1.10.0