From a997a5af5785ee040a9ef2bca66904c7624c0b60 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 29 Feb 2016 12:57:49 +0000
Subject: [PATCH] OPENDJ-2688 Upgrade: Error in matching rule when starting server after upgrade

---
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
index 7bfdb7e..e78e571 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
@@ -195,20 +195,18 @@
   }
 
   /**
-   * Returns a new upgrade task which deletes a config entry from the underlying
-   * config file.
+   * Returns a new upgrade task which deletes a config entry from the underlying config file.
    *
    * @param summary
    *          The summary of this upgrade task.
-   * @param dnInLDIF
-   *          The dn to delete in the form of LDIF.
-   * @return A new upgrade task which applies an LDIF record to all
-   *         configuration entries matching the provided filter.
+   * @param dnsInLDIF
+   *          The dns to delete in the form of LDIF.
+   * @return A new upgrade task which applies an LDIF record to all configuration entries matching
+   *         the provided filter.
    */
-  public static UpgradeTask deleteConfigEntry(final LocalizableMessage summary,
-      final String dnInLDIF)
+  public static UpgradeTask deleteConfigEntry(final LocalizableMessage summary, final String... dnsInLDIF)
   {
-    return updateConfigEntry(summary, null, ChangeOperationType.DELETE, dnInLDIF);
+    return updateConfigEntry(summary, null, ChangeOperationType.DELETE, dnsInLDIF);
   }
 
   /**

--
Gitblit v1.10.0