From cc3c0bcf6cec93bfc3e2044d4cb765e45ad1e0a9 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 29 Jun 2016 20:31:10 +0000
Subject: [PATCH] Minor code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java | 11 +++++------
1 files changed, 5 insertions(+), 6 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 22074c4..e6df160 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
@@ -119,7 +119,7 @@
final String path = getInstallPath(classPaths);
if (path == null)
{
- return installPath;
+ return null;
}
/*
@@ -332,9 +332,8 @@
final Filter filter, final ChangeOperationType changeType,
final String... ldifLines) throws IOException
{
- final File original = configFile;
final File copyConfig =
- File.createTempFile("copyConfig", ".tmp", original.getParentFile());
+ File.createTempFile("copyConfig", ".tmp", configFile.getParentFile());
int changeCount = 0;
final Schema schema = getUpgradeSchema();
@@ -416,7 +415,7 @@
if (changeType == ADD && !entryAlreadyExist)
{
writer.writeEntry(Requests.newAddRequest(ldifLines));
- logger.debug(LocalizableMessage.raw("Entry successfully added %s in %s", ldifDN, original.getAbsolutePath()));
+ logger.debug(LocalizableMessage.raw("Entry successfully added %s in %s", ldifDN, configFile.getAbsolutePath()));
changeCount++;
}
}
@@ -437,7 +436,7 @@
catch (IOException e)
{
logger.error(LocalizableMessage.raw(e.getMessage()));
- deleteRecursively(original);
+ deleteRecursively(configFile);
throw e;
}
}
@@ -531,7 +530,7 @@
return changeCount;
}
- private static Entry readFirstEntryFromTemplate(final File destination) throws DecodeException, IOException
+ private static Entry readFirstEntryFromTemplate(final File destination) throws IOException
{
try (LDIFEntryReader r = new LDIFEntryReader(new FileInputStream(destination)))
{
--
Gitblit v1.10.0