From f6beccdd93ff6c7fee022805c8390ca51bd03511 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Mon, 29 Feb 2016 13:32:08 +0000
Subject: [PATCH] OPENDJ-2716 update the changelog schema in-place instead of overwriting entire file
---
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java
index 6699965..54f7c78 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java
@@ -506,22 +506,22 @@
}
/**
- * This task adds new attributes / object classes to the specified destination
- * file. The new attributes and object classes must be originally defined in
- * the template file.
+ * This task adds or updates attributes / object classes in the specified
+ * destination file. The new attributes and object classes must be originally
+ * defined in the template file. The definitions will replace previous definitions
+ * if they have the same normalized value (i.e. OID), and add new definitions if
+ * they don't previously exist.
*
* @param templateFile
- * The file in which the new attribute/object definition can be read.
+ * The file in which the attribute/object definition can be read.
* @param destination
- * The file where we want to add the new definitions.
+ * The file where we want to update the definitions.
* @param attributes
- * Those attributes needed to be inserted into the new destination
- * file.
+ * Those attributes needed to be stored in the new destination file.
* @param objectClasses
- * Those object classes needed to be inserted into the new
- * destination file.
+ * Those object classes needed to be stored in the new destination file.
* @return An integer which represents each time an attribute / object class
- * is inserted successfully to the destination file.
+ * is updated successfully in the destination file.
* @throws IOException
* If an unexpected IO error occurred while reading the entry.
* @throws IllegalStateException
--
Gitblit v1.10.0