From a41662c1136b2bb4a4198df89e0e87d2be3ef099 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 16 Jul 2015 14:57:56 +0000
Subject: [PATCH] AutoRefactor'ed simplify expressions
---
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 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 152d7ff..d15a57c 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
@@ -282,12 +282,12 @@
{
return false;
}
- while ((descendant != null) && !ancestor.equals(descendant))
+ while (descendant != null && !ancestor.equals(descendant))
{
descendant = descendant.getParentFile();
}
}
- return (ancestor != null) && (descendant != null);
+ return ancestor != null && descendant != null;
}
/**
@@ -300,17 +300,16 @@
* either of the files are null
*/
static boolean isDescendant(File descendant, File path) {
- boolean isDescendant = false;
if (descendant != null && path != null) {
File parent = descendant.getParentFile();
- while ((parent != null) && !isDescendant) {
- isDescendant = path.equals(parent);
- if (!isDescendant) {
- parent = parent.getParentFile();
+ while (parent != null) {
+ if (path.equals(parent)) {
+ return true;
}
+ parent = parent.getParentFile();
}
}
- return isDescendant;
+ return false;
}
/**
--
Gitblit v1.10.0