From 955aa04202762358d83b2356d1394d712cf306ee Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Mon, 28 Nov 2011 13:03:37 +0000
Subject: [PATCH] Fix for OPENDJ-255: Incorrect dsconfig usage for setting multiple property values at once. Contribution by German Parente (cgp). Both --set prop:value1 --set prop:value2 AND --set prop:value1 --add prop:value2 are accepted to set/create multivalued properties with dsconfig. When adding to existing property, --add is to be used.
---
opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java b/opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java
index d29039b..6300ba0 100644
--- a/opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java
+++ b/opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.tools.dsconfig;
@@ -823,11 +824,6 @@
}
// Apply the modification.
- if (lastModTypes.containsKey(propertyName) &&
- (lastModTypes.get(propertyName) == ModificationType.SET)) {
- throw ArgumentExceptionFactory.incompatiblePropertyModification(m);
- }
-
if (lastModTypes.containsKey(propertyName)) {
modifyPropertyValues(child, pd, changes, ModificationType.ADD, value);
} else {
--
Gitblit v1.10.0