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/backends/task/TaskScheduler.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskScheduler.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskScheduler.java
index f9c5b70..a0dd01d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskScheduler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskScheduler.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.backends.task;
@@ -1675,12 +1675,9 @@
try
{
Entry e = t.getTaskEntry().duplicate(true);
- if (filter.matchesEntry(e))
+ if (filter.matchesEntry(e) && !searchOperation.returnEntry(e, null))
{
- if (! searchOperation.returnEntry(e, null))
- {
- return false;
- }
+ return false;
}
}
finally
@@ -1826,12 +1823,9 @@
try
{
Entry e = rt.getRecurringTaskEntry().duplicate(true);
- if (filter.matchesEntry(e))
+ if (filter.matchesEntry(e) && ! searchOperation.returnEntry(e, null))
{
- if (! searchOperation.returnEntry(e, null))
- {
- return false;
- }
+ return false;
}
}
finally
--
Gitblit v1.10.0