From 91d372cca007303222f2ec621da6b2e62480fbc3 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 25 Aug 2015 16:02:28 +0000
Subject: [PATCH] Use Collection.contains() Used early exits Removed duplicated code
---
opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskBackend.java | 30 ++++++++++--------------------
1 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskBackend.java
index 38fb253..8153858 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskBackend.java
@@ -733,46 +733,39 @@
*/
private boolean isReplaceEntryAcceptable(ModifyOperation modifyOperation)
{
- boolean acceptable = true;
-
for (Modification m : modifyOperation.getModifications()) {
if (m.isInternal()) {
continue;
}
if (m.getModificationType() != ModificationType.REPLACE) {
- acceptable = false;
- break;
+ return false;
}
Attribute a = m.getAttribute();
AttributeType at = a.getAttributeType();
if (!at.hasName(ATTR_TASK_STATE)) {
- acceptable = false;
- break;
+ return false;
}
Iterator<ByteString> iterator = a.iterator();
if (!iterator.hasNext()) {
- acceptable = false;
- break;
+ return false;
}
ByteString v = iterator.next();
+ if (iterator.hasNext()) {
+ return false;
+ }
+
String valueString = toLowerCase(v.toString());
if (!valueString.startsWith("cancel")
&& !valueString.startsWith("stop")) {
- acceptable = false;
- break;
- }
-
- if (iterator.hasNext()) {
- acceptable = false;
- break;
+ return false;
}
}
- return acceptable;
+ return true;
}
@@ -1069,10 +1062,7 @@
LocalizableMessage message = ERR_TASKS_CANNOT_EXPORT_TO_FILE.get(e);
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, le);
}
- else
- {
- continue;
- }
+ continue;
}
ldifWriter.writeEntry(e);
}
--
Gitblit v1.10.0