From 3c64e2dd5fdb72bbc12b99ac385d5f69438732b9 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 05 Jan 2016 13:59:21 +0000
Subject: [PATCH] Code cleanups. Added toString() to UpgradeTasks.
---
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
index 25a9ca8..d764afd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2013-2015 ForgeRock AS
+ * Portions Copyright 2013-2016 ForgeRock AS
*/
package org.opends.server.tools.upgrade;
@@ -38,7 +38,6 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.core.LockFileManager;
import org.opends.server.util.BuildVersion;
-import org.opends.server.util.StaticUtils;
import com.forgerock.opendj.cli.ClientException;
import com.forgerock.opendj.cli.ReturnCode;
@@ -413,6 +412,11 @@
public boolean shouldPerformUpgradeTasks(UpgradeContext context) throws ClientException {
return !isOEMVersion();
}
+
+ @Override
+ public String toString() {
+ return "!isOEMVersion";
+ }
},
migrateLocalDBBackendsToJEBackends(),
modifyConfigEntry(INFO_UPGRADE_TASK_MIGRATE_JE_SUMMARY_2.get(),
@@ -460,6 +464,11 @@
public boolean shouldPerformUpgradeTasks(UpgradeContext context) throws ClientException {
return isOEMVersion();
}
+
+ @Override
+ public String toString() {
+ return "isOEMVersion";
+ }
},
deleteFile(new File(libDirectory, "je.jar")),
requireConfirmation(INFO_UPGRADE_TASK_LOCAL_DB_TO_PDB_1_SUMMARY.get(), NO,
@@ -809,11 +818,9 @@
private static void changeBuildInfoVersion(final UpgradeContext context)
throws ClientException
{
- FileWriter buildInfo = null;
- try
+ File buildInfoFile = new File(UpgradeUtils.configDirectory, Installation.BUILDINFO_RELATIVE_PATH);
+ try (FileWriter buildInfo = new FileWriter(buildInfoFile, false))
{
- buildInfo =
- new FileWriter(new File(UpgradeUtils.configDirectory, Installation.BUILDINFO_RELATIVE_PATH), false);
// Write the new version
buildInfo.write(context.getToVersion().toString());
@@ -826,10 +833,6 @@
context.notify(message, ERROR_CALLBACK);
throw new ClientException(ReturnCode.ERROR_UNEXPECTED, message);
}
- finally
- {
- StaticUtils.close(buildInfo);
- }
}
private static void checkLicence(final UpgradeContext context)
@@ -896,9 +899,9 @@
}
}
}
- catch (SecurityException se)
+ catch (SecurityException e)
{
- logger.debug(LocalizableMessage.raw(se.getMessage()));
+ logger.debug(LocalizableMessage.raw(e.getMessage()), e);
}
}
--
Gitblit v1.10.0