From 61c9a2cb2e9f54a89b78183c27ad9f9c2ecb1f40 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 18 Nov 2013 16:25:02 +0000
Subject: [PATCH] Minor code cleanup.
---
opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java b/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java
index 14a1875..98b776c 100644
--- a/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java
+++ b/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java
@@ -396,14 +396,14 @@
final ModifyRequest request = Requests.newModifyRequest(fromEntry.getName());
- TreeMapEntry tfrom;
+ final TreeMapEntry tfrom;
if (fromEntry instanceof TreeMapEntry) {
tfrom = (TreeMapEntry) fromEntry;
} else {
tfrom = new TreeMapEntry(fromEntry);
}
- TreeMapEntry tto;
+ final TreeMapEntry tto;
if (toEntry instanceof TreeMapEntry) {
tto = (TreeMapEntry) toEntry;
} else {
@@ -419,14 +419,13 @@
while (afrom != null && ato != null) {
final AttributeDescription adfrom = afrom.getAttributeDescription();
final AttributeDescription adto = ato.getAttributeDescription();
-
final int cmp = adfrom.compareTo(adto);
if (cmp == 0) {
- // Attribute is in both entries. Compute the set of values to be
- // added
- // and removed. We won't replace the attribute because this is
- // not
- // reversible.
+ /*
+ * Attribute is in both entries. Compute the set of values to be
+ * added and removed. We won't replace the attribute because
+ * this is not reversible.
+ */
final Attribute addedValues = new LinkedAttribute(ato);
addedValues.removeAll(afrom);
if (!addedValues.isEmpty()) {
--
Gitblit v1.10.0