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/guitools/controlpanel/task/ResetUserPasswordTask.java | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
index 06a9b53..b95eadc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.task;
@@ -187,26 +187,24 @@
public boolean canLaunch(Task taskToBeLaunched,
Collection<LocalizableMessage> incompatibilityReasons)
{
- boolean canLaunch = true;
- if (!isServerRunning())
+ if (!isServerRunning()
+ && state == State.RUNNING
+ && runningOnSameServer(taskToBeLaunched))
{
- if (state == State.RUNNING && runningOnSameServer(taskToBeLaunched))
+ // All the operations are incompatible if they apply to this
+ // backend for safety. This is a short operation so the limitation
+ // has not a lot of impact.
+ Set<String> backends =
+ new TreeSet<String>(taskToBeLaunched.getBackends());
+ backends.retainAll(getBackends());
+ if (backends.size() > 0)
{
- // All the operations are incompatible if they apply to this
- // backend for safety. This is a short operation so the limitation
- // has not a lot of impact.
- Set<String> backends =
- new TreeSet<String>(taskToBeLaunched.getBackends());
- backends.retainAll(getBackends());
- if (backends.size() > 0)
- {
- incompatibilityReasons.add(getIncompatibilityMessage(this,
- taskToBeLaunched));
- canLaunch = false;
- }
+ incompatibilityReasons.add(getIncompatibilityMessage(this,
+ taskToBeLaunched));
+ return false;
}
}
- return canLaunch;
+ return true;
}
/**
--
Gitblit v1.10.0