From 8433427527214c83f56c533259efd7f56a1863b3 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 03 Nov 2014 10:50:04 +0000
Subject: [PATCH] AutoRefactored: - work with null checked expressions first - revert conditions - collapse if statements - push negations down - invert equals()
---
opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java
index 35ac48f..7d585ed 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java
@@ -709,18 +709,14 @@
pvalues.add(value);
}
- if (pvalues.isEmpty() && propertyDef.hasOption(PropertyOption.MANDATORY)) {
- // The values maybe empty because of a previous exception.
- if (exception == null) {
- exception = PropertyException.propertyIsMandatoryException(propertyDef);
- }
+ if (pvalues.isEmpty() && propertyDef.hasOption(PropertyOption.MANDATORY) && exception == null) {
+ exception = PropertyException.propertyIsMandatoryException(propertyDef);
}
if (exception != null) {
throw exception;
- } else {
- return pvalues;
}
+ return pvalues;
}
/** Gets the attribute values associated with a property from a ConfigEntry. */
--
Gitblit v1.10.0