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/quicksetup/util/FileManager.java | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/FileManager.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/FileManager.java
index 0b2f923..c110191 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/FileManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/FileManager.java
@@ -130,12 +130,11 @@
throws ApplicationException {
if (fileToRename != null && target != null) {
synchronized (target) {
- if (target.exists()) {
- if (!target.delete()) {
- throw new ApplicationException(
- ReturnCode.FILE_SYSTEM_ACCESS_ERROR,
- INFO_ERROR_DELETING_FILE.get(Utils.getPath(target)), null);
- }
+ if (target.exists() && !target.delete())
+ {
+ throw new ApplicationException(
+ ReturnCode.FILE_SYSTEM_ACCESS_ERROR,
+ INFO_ERROR_DELETING_FILE.get(Utils.getPath(target)), null);
}
}
if (!fileToRename.renameTo(target)) {
@@ -503,16 +502,11 @@
while ((i = fis.read(buf)) != -1) {
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()) {
- String permissions =
- Utils.getFileSystemPermissions(objectFile);
- Utils.setPermissionsUnix(
- Utils.getPath(destination),
- permissions);
- }
+ String permissions = Utils.getFileSystemPermissions(objectFile);
+ Utils.setPermissionsUnix(Utils.getPath(destination), permissions);
}
if ((application != null) && application.isVerbose()) {
--
Gitblit v1.10.0