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/PropertyDefinition.java |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinition.java
index 14d6bca..6be5c24 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinition.java
@@ -367,12 +367,8 @@
             return true;
         } else if (o instanceof PropertyDefinition) {
             PropertyDefinition<?> other = (PropertyDefinition<?>) o;
-            if (propertyName.equals(other.propertyName)) {
-                if (theClass.equals(other.theClass)) {
-                    return true;
-                }
-            }
-            return false;
+            return propertyName.equals(other.propertyName)
+                    && theClass.equals(other.theClass);
         } else {
             return false;
         }

--
Gitblit v1.10.0