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/client/spi/PropertySet.java

@@ -277,11 +277,8 @@
            throw PropertyException.propertyIsSingleValuedException(d);
        }

        if (values.isEmpty() && d.hasOption(PropertyOption.MANDATORY)) {
            // But only if there are no default values.
            if (property.getDefaultValues().isEmpty()) {
                throw PropertyException.propertyIsMandatoryException(d);
            }
        if (values.isEmpty() && d.hasOption(PropertyOption.MANDATORY) && property.getDefaultValues().isEmpty()) {
            throw PropertyException.propertyIsMandatoryException(d);
        }

        // Validate each value.