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/test/java/org/forgerock/opendj/config/ConfigurationMock.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java b/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java
index eb497a8..6aae1fb 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java
+++ b/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);
             }

--
Gitblit v1.10.0