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/client/ldap/LDAPDriver.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPDriver.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPDriver.java
index 73a3082..663e6e3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPDriver.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPDriver.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.admin.client.ldap;
@@ -640,13 +640,12 @@
newProperties.addProperty(pd, defaultValues, activeValues);
- if (activeValues.isEmpty() && defaultValues.isEmpty()
- && pd.hasOption(PropertyOption.MANDATORY)) {
- // The active values maybe empty because of a previous
- // exception.
- if (exception == null) {
- exception = PropertyException.propertyIsMandatoryException(pd);
- }
+ if (activeValues.isEmpty()
+ && defaultValues.isEmpty()
+ && pd.hasOption(PropertyOption.MANDATORY)
+ // The active values maybe empty because of a previous exception.
+ && exception == null) {
+ exception = PropertyException.propertyIsMandatoryException(pd);
}
if (exception != null) {
--
Gitblit v1.10.0