From ab8c1e1f21dab0f29d66431933a794f05430fe30 Mon Sep 17 00:00:00 2001
From: ian.packer <ian.packer@forgerock.com>
Date: Thu, 31 Mar 2016 15:38:05 +0000
Subject: [PATCH] OPENDJSDK-92 Update diffEntries to ensure DiffOptions replaceSingleValuedAttributes() has the expected effect
---
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java | 2 +-
opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java
index 7af4998..d216898 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java
@@ -571,7 +571,7 @@
final int cmp = adfrom.compareTo(adto);
if (cmp == 0) {
/* Attribute is in both entries so compute the differences between the old and new. */
- if (options.useReplaceMaxValues > ato.size()) {
+ if (options.useReplaceMaxValues >= ato.size()) {
// This attribute is a candidate for replacing.
if (diffAttributeNeedsReplacing(afrom, ato, options)) {
request.addModification(new Modification(ModificationType.REPLACE, ato));
diff --git a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java
index 46537a8..a78ee93 100644
--- a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java
+++ b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions copyright 2014 ForgeRock AS.
+ * Portions copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.ldap;
@@ -424,7 +424,7 @@
"replace: description",
"description: to");
// @formatter:on
- assertEquals(diffEntries(from, to, diffOptions().alwaysReplaceAttributes()), expected);
+ assertEquals(diffEntries(from, to, diffOptions().replaceSingleValuedAttributes()), expected);
}
@Test
--
Gitblit v1.10.0