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

Jean-Noel Rouvignac

03.50.2014 8433427527214c83f56c533259efd7f56a1863b3

 opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java

@@ -97,10 +97,10 @@
                Method getPropertyDefMethod = getPropertyDefinitionMethod(definitionClass, invokedMethodName);
                Class<?> propertyReturnType = getPropertyReturnType(getPropertyDefMethod);
                Object defaultValue = getDefaultValue(definition, getPropertyDefMethod, propertyReturnType);
                if (defaultValue == null) {
                    return answerFromDefaultMockitoBehavior(invocation);
                if (defaultValue != null) {
                    return defaultValue;
                }
                return defaultValue;
                return answerFromDefaultMockitoBehavior(invocation);
            } catch (Exception e) {
                return answerFromDefaultMockitoBehavior(invocation);
            }