From 87327546e05c4b92ff15b210345f0933a833fd72 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Tue, 13 Aug 2013 09:31:33 +0000
Subject: [PATCH] Fixes for OPENDJ-1111 + SVR4 specific fix related to OPENDJ-1066. Reviewed in CR 2142.
---
opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
index 085e8aa..3664fc7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
@@ -43,11 +43,11 @@
import javax.security.auth.callback.ConfirmationCallback;
import org.opends.messages.Message;
-import org.opends.server.controls.PersistentSearchChangeType;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.tools.ClientException;
import org.opends.server.tools.upgrade.UpgradeTask.TaskType;
import org.opends.server.util.BuildVersion;
+import org.opends.server.util.ChangeOperationType;
/**
* Factory methods for create new upgrade tasks.
@@ -60,7 +60,7 @@
static int countErrors = 0;
/**
- * Upgrade's logger.
+ * Logger for the upgrade
*/
static private final Logger LOG = Logger
.getLogger(UpgradeCli.class.getName());
@@ -580,16 +580,16 @@
try
{
final File oldSnmpConfig =
- new File(UpgradeUtils.configSnmpSecurityDirectory
- + File.separator + "opends-snmp.security");
+ new File(UpgradeUtils.configSnmpSecurityDirectory,
+ "opends-snmp.security");
if (oldSnmpConfig.exists())
{
context.notifyProgress(pnc.setProgress(20));
LOG.log(Level.INFO, summary.toString());
final File snmpConfig =
- new File(UpgradeUtils.configSnmpSecurityDirectory
- + File.separator + "opendj-snmp.security");
+ new File(UpgradeUtils.configSnmpSecurityDirectory,
+ "opendj-snmp.security");
FileManager.rename(oldSnmpConfig, snmpConfig);
@@ -655,7 +655,7 @@
final int changeCount =
updateConfigFile(configFile.getPath(), null,
- PersistentSearchChangeType.ADD, ldif);
+ ChangeOperationType.ADD, ldif);
displayChangeCount(configFile.getPath(), changeCount);
@@ -692,7 +692,7 @@
LOG.log(Level.INFO, summary);
if (filter != null)
{
- LOG.log(Level.INFO, filter.toString());
+ LOG.log(Level.INFO, filter);
}
if (ldif != null)
{
@@ -760,7 +760,7 @@
final int changeCount =
updateConfigFile(configFile.getPath(), LDAPFilter
- .decode(filter), PersistentSearchChangeType.MODIFY, ldif);
+ .decode(filter), ChangeOperationType.MODIFY, ldif);
displayChangeCount(configFile.getPath(), changeCount);
--
Gitblit v1.10.0