From edf8944f0ae80b608797206944cbd2db8d08a9a7 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 23 Dec 2015 14:52:02 +0000
Subject: [PATCH] Remove unnecessary null checks for Operation.getRequestControls()
---
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/MultimasterReplication.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/MultimasterReplication.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/MultimasterReplication.java
index 8f45cb3..9642cf3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/MultimasterReplication.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/MultimasterReplication.java
@@ -156,10 +156,9 @@
* running later do not generate CSN, solve conflicts and forward the
* operation to the replication server.
*/
- final List<Control> controls = op.getRequestControls();
- for (Iterator<Control> iter = controls.iterator(); iter.hasNext();)
+ for (Iterator<Control> it = op.getRequestControls().iterator(); it.hasNext();)
{
- Control c = iter.next();
+ Control c = it.next();
if (OID_REPLICATION_REPAIR_CONTROL.equals(c.getOID()))
{
op.setSynchronizationOperation(true);
@@ -169,7 +168,7 @@
processed and the local backend will fail if it finds a control that
it does not know about and that is marked as critical.
*/
- iter.remove();
+ it.remove();
return null;
}
}
--
Gitblit v1.10.0