From ca669ae54f86dbeea277280690584d9f591c7571 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 18 Feb 2015 07:26:26 +0000
Subject: [PATCH] AutoRefactor: collapse if statements
---
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java
index 4d2f282..965279b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java
@@ -213,13 +213,10 @@
{
synchronized (target)
{
- if (target.exists())
+ if (target.exists() && !target.delete())
{
- if (!target.delete())
- {
- throw new IOException(INFO_ERROR_DELETING_FILE.get(
- UpgradeUtils.getPath(target)).toString());
- }
+ throw new IOException(INFO_ERROR_DELETING_FILE.get(
+ UpgradeUtils.getPath(target)).toString());
}
}
if (!fileToRename.renameTo(target))
@@ -384,16 +381,12 @@
{
fos.write(buf, 0, i);
}
- if (destination.exists())
+ if (destination.exists() && isUnix())
{
// TODO: set the file's permissions. This is made easier in
// Java 1.6 but until then use the TestUtilities methods
- if (isUnix())
- {
- final FilePermission permissions =
- getFileSystemPermissions(objectFile);
- FilePermission.setPermissions(destination, permissions);
- }
+ final FilePermission permissions = getFileSystemPermissions(objectFile);
+ FilePermission.setPermissions(destination, permissions);
}
}
catch (IOException e)
--
Gitblit v1.10.0