From a41662c1136b2bb4a4198df89e0e87d2be3ef099 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 16 Jul 2015 14:57:56 +0000
Subject: [PATCH] AutoRefactor'ed simplify expressions
---
opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObject.java | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObject.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObject.java
index 22b21a4..423c79b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObject.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObject.java
@@ -1417,8 +1417,7 @@
for(; i > 0; i--)
{
wrappedListener = delayListener.getDelayedAddListener();
- if(wrappedListener != null &&
- wrappedListener instanceof DelayedConfigAddListener)
+ if(wrappedListener instanceof DelayedConfigAddListener)
{
delayListener = (DelayedConfigAddListener) l;
}
@@ -1438,8 +1437,7 @@
ConfigAddListener delayedListener =
delayListener.getDelayedAddListener();
- if (delayedListener != null &&
- delayedListener instanceof ConfigAddListenerAdaptor) {
+ if (delayedListener instanceof ConfigAddListenerAdaptor) {
ConfigAddListenerAdaptor<?> adaptor =
(ConfigAddListenerAdaptor<?>) delayedListener;
ServerManagedObjectAddListener<?> l2 = adaptor
@@ -1486,8 +1484,7 @@
for(; i > 0; i--)
{
wrappedListener = delayListener.getDelayedAddListener();
- if(wrappedListener != null &&
- wrappedListener instanceof DelayedConfigAddListener)
+ if(wrappedListener instanceof DelayedConfigAddListener)
{
delayListener = (DelayedConfigAddListener) l;
}
@@ -1507,8 +1504,7 @@
ConfigDeleteListener delayedListener =
delayListener.getDelayedDeleteListener();
- if (delayedListener != null &&
- delayedListener instanceof ConfigDeleteListenerAdaptor) {
+ if (delayedListener instanceof ConfigDeleteListenerAdaptor) {
ConfigDeleteListenerAdaptor<?> adaptor =
(ConfigDeleteListenerAdaptor<?>) delayedListener;
ServerManagedObjectDeleteListener<?> l2 = adaptor
@@ -1553,8 +1549,7 @@
for(; i > 0; i--)
{
wrappedListener = delayListener.getDelayedAddListener();
- if(wrappedListener != null &&
- wrappedListener instanceof DelayedConfigAddListener)
+ if(wrappedListener instanceof DelayedConfigAddListener)
{
delayListener = (DelayedConfigAddListener) l;
}
@@ -1574,8 +1569,7 @@
ConfigAddListener delayedListener =
delayListener.getDelayedAddListener();
- if (delayedListener != null &&
- delayedListener instanceof ConfigAddListenerAdaptor) {
+ if (delayedListener instanceof ConfigAddListenerAdaptor) {
ConfigAddListenerAdaptor<?> adaptor =
(ConfigAddListenerAdaptor<?>) delayedListener;
if (adaptor.getServerManagedObjectAddListener() == listener) {
@@ -1616,8 +1610,7 @@
for(; i > 0; i--)
{
wrappedListener = delayListener.getDelayedAddListener();
- if(wrappedListener != null &&
- wrappedListener instanceof DelayedConfigAddListener)
+ if(wrappedListener instanceof DelayedConfigAddListener)
{
delayListener = (DelayedConfigAddListener) l;
}
@@ -1637,8 +1630,7 @@
ConfigDeleteListener delayedListener =
delayListener.getDelayedDeleteListener();
- if (delayedListener != null &&
- delayedListener instanceof ConfigDeleteListenerAdaptor) {
+ if (delayedListener instanceof ConfigDeleteListenerAdaptor) {
ConfigDeleteListenerAdaptor<?> adaptor =
(ConfigDeleteListenerAdaptor<?>) delayedListener;
if (adaptor.getServerManagedObjectDeleteListener() == listener) {
--
Gitblit v1.10.0