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/admin/server/ServerManagementContext.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagementContext.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagementContext.java
index c61abe1..3f201e9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagementContext.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagementContext.java
@@ -874,18 +874,17 @@
pvalues.add(value);
}
- if (pvalues.isEmpty() && pd.hasOption(PropertyOption.MANDATORY)) {
- // The values maybe empty because of a previous exception.
- if (exception == null) {
- exception = PropertyException.propertyIsMandatoryException(pd);
- }
+ if (pvalues.isEmpty()
+ && pd.hasOption(PropertyOption.MANDATORY)
+ // The values maybe empty because of a previous exception.
+ && exception == null) {
+ exception = PropertyException.propertyIsMandatoryException(pd);
}
if (exception != null) {
throw exception;
- } else {
- return pvalues;
}
+ return pvalues;
}
--
Gitblit v1.10.0