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/client/ldap/LDAPDriver.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPDriver.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPDriver.java
index 62acf30..6c397bf 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPDriver.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPDriver.java
@@ -486,12 +486,12 @@
newProperties.addProperty(propertyDef, defaultValues, activeValues);
- if (activeValues.isEmpty() && defaultValues.isEmpty() && propertyDef.hasOption(PropertyOption.MANDATORY)) {
- // The active values maybe empty because of a previous
- // exception.
- if (exception == null) {
- exception = PropertyException.propertyIsMandatoryException(propertyDef);
- }
+ if (activeValues.isEmpty()
+ && defaultValues.isEmpty()
+ && propertyDef.hasOption(PropertyOption.MANDATORY)
+ && exception == null) {
+ // The active values maybe empty because of a previous exception.
+ exception = PropertyException.propertyIsMandatoryException(propertyDef);
}
if (exception != null) {
@@ -499,9 +499,8 @@
}
}
- // Determine the type of managed object associated with the named
- // entry.
// @Checkstyle:off
+ /** Determine the type of managed object associated with the named entry. */
private <C extends ConfigurationClient, S extends Configuration> ManagedObjectDefinition<? extends C, ? extends S>
getEntryDefinition(AbstractManagedObjectDefinition<C, S> d, DN dn) throws LdapException,
DefinitionDecodingException {
--
Gitblit v1.10.0