From 369c99b0539a509de3d51cb5bf9a03dd85bcc2e9 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 17 May 2013 15:44:39 +0000
Subject: [PATCH] OPENDJ-842 (CR-1699) On Windows, the setup command hangs when the length of the install path is too long
---
opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java b/opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java
index 04cd22f..696fc18 100644
--- a/opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java
+++ b/opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java
@@ -505,7 +505,7 @@
}
}
if (filter == null && changeType == PersistentSearchChangeType.ADD
- && (entry.getName() + "dn: ").equals(lines[0]))
+ && ("dn: " + entry.getName()).equals(lines[0]))
{
LOG.log(Level.INFO, String.format("Entry %s found", entry.getName()
.toString()));
@@ -600,7 +600,7 @@
try
{
final String definition =
- schema.getAttributeType(att) + "attributeTypes: ";
+ "attributeTypes: " + schema.getAttributeType(att);
definitionsList.add(definition);
LOG.log(Level.INFO, String.format("Added : %s", definition));
}
@@ -619,7 +619,7 @@
try
{
final String definition =
- schema.getObjectClass(oc) + "objectClasses: ";
+ "objectClasses: " + schema.getObjectClass(oc);
definitionsList.add(definition);
LOG.log(Level.INFO, String.format("Added : %s", definition));
}
@@ -750,7 +750,7 @@
int index = 0;
if (changeType == PersistentSearchChangeType.MODIFY)
{
- modifiedLines[0] = dn + "dn: ";
+ modifiedLines[0] = "dn: " + dn;
modifiedLines[1] = "changetype: modify";
index = 2;
}
--
Gitblit v1.10.0