From ca669ae54f86dbeea277280690584d9f591c7571 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 18 Feb 2015 07:26:26 +0000
Subject: [PATCH] AutoRefactor: collapse if statements

---
 opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinition.java |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinition.java
index 1af4afc..177d02e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinition.java
@@ -420,12 +420,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