From 4aeaf5775f4edc7af87aa33058ae3db25d27f9a9 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 23 Jun 2016 13:59:36 +0000
Subject: [PATCH] OPENDJ-3149 Upgrade 3.0.0 -> 4.0.0: Error in logs after upgrading a replication topology
---
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 a04d8cc..0a5a90c 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
@@ -25,6 +25,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.tools.upgrade.FileManager.copy;
import static org.opends.server.tools.upgrade.UpgradeUtils.*;
+import static org.opends.server.types.Schema.*;
import static org.opends.server.util.StaticUtils.*;
import java.io.BufferedWriter;
@@ -1431,11 +1432,12 @@
if (!configCsvCharAT.isPlaceHolder() && concatenatedCsvCharAT.isPlaceHolder())
{
+ final String csvCharAttrTypeDefinition = configCsvCharAT.toString().trim();
try (BufferedWriter writer = Files.newBufferedWriter(concatenatedSchemaFile.toPath(), UTF_8, APPEND))
{
writer.append(CoreSchema.getAttributeTypesAttributeType().getNameOrOID());
writer.append(": ");
- writer.append(configCsvCharAT.toString().trim());
+ writer.append(addSchemaFileToElementDefinitionIfAbsent(csvCharAttrTypeDefinition, "02-config.ldif"));
writer.newLine();
}
catch (IOException e)
--
Gitblit v1.10.0