From 2e83705627546bbf34e6f1fe6922c51bcbf5d0a0 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Mon, 02 Dec 2013 09:34:32 +0000
Subject: [PATCH] CR-2635 Second fix for OpenDJ-1196. As an issue was find by Christophe when template 02-config was deleted, added a check on template existence before copying it. - Added i18n/path in messages. - Added message ouput for post upgrade task. - Moved temp file creation as it leaves .temp files in schema folder when upgrade fails.
---
opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/FileManager.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/FileManager.java b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/FileManager.java
index 320049b..afa1847 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/FileManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/FileManager.java
@@ -40,7 +40,6 @@
import java.io.File;
import java.io.FileFilter;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.logging.Logger;
@@ -353,7 +352,7 @@
*/
public void apply() throws IOException
{
- File objectFile = getObjectFile();
+ final File objectFile = getObjectFile();
if (objectFile.isDirectory())
{
if (!destination.exists())
@@ -363,7 +362,6 @@
}
else
{
-
// If overwriting and the destination exists then kill it
if (destination.exists() && overwrite)
{
@@ -383,7 +381,7 @@
{
fis = new FileInputStream(objectFile);
fos = new FileOutputStream(destination);
- byte[] buf = new byte[1024];
+ final byte[] buf = new byte[1024];
int i;
while ((i = fis.read(buf)) != -1)
{
@@ -395,22 +393,21 @@
// Java 1.6 but until then use the TestUtilities methods
if (UpgradeUtils.isUnix())
{
- FilePermission permissions =
+ final FilePermission permissions =
getFileSystemPermissions(objectFile);
FilePermission.setPermissions(destination, permissions);
}
}
-
}
- catch (FileNotFoundException e)
+ catch (IOException e)
{
- throw new IOException(e.getMessage());
+ throw e;
}
catch (Exception e)
{
final Message errMsg = INFO_ERROR_COPYING_FILE.get(
objectFile.getAbsolutePath(), destination.getAbsolutePath());
- throw new IOException(errMsg.toString());
+ throw new IOException(errMsg.toString(), e);
}
finally
{
--
Gitblit v1.10.0