AutoRefactored: - work with null checked expressions first - revert conditi...

Jean-Noel Rouvignac

03.50.2014 8433427527214c83f56c533259efd7f56a1863b3

 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. */