From 1ef65104c4113a1c6fad7ee93bc9862218a4bc68 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 16 Feb 2015 14:10:23 +0000
Subject: [PATCH] AutoRefactor: common code in if else statements
---
opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPModify.java | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPModify.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPModify.java
index 643d734..9cc5504 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPModify.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPModify.java
@@ -1066,23 +1066,14 @@
connectionOptions.setSASLExternal(saslExternal.isPresent());
if(saslOptions.isPresent())
{
- LinkedList<String> values = saslOptions.getValues();
- for(String saslOption : values)
+ for (String saslOption : saslOptions.getValues())
{
- if(saslOption.startsWith("mech="))
+ boolean val = saslOption.startsWith("mech=")
+ ? connectionOptions.setSASLMechanism(saslOption)
+ : connectionOptions.addSASLProperty(saslOption);
+ if (!val)
{
- boolean val = connectionOptions.setSASLMechanism(saslOption);
- if(val == false)
- {
- return CLIENT_SIDE_PARAM_ERROR;
- }
- } else
- {
- boolean val = connectionOptions.addSASLProperty(saslOption);
- if(val == false)
- {
- return CLIENT_SIDE_PARAM_ERROR;
- }
+ return CLIENT_SIDE_PARAM_ERROR;
}
}
}
--
Gitblit v1.10.0