From f983fc4bc7a4dc0e9d175e77cfaf8a2127aaeb2d Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 25 Feb 2015 14:16:50 +0000
Subject: [PATCH] AutoRefactor: fix boolean usage
---
opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordSyntax.java | 23 ++++++-----------------
1 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordSyntax.java
index e95a13d..fe2039f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
import org.forgerock.i18n.LocalizableMessage;
@@ -294,7 +294,7 @@
public static boolean isEncoded(ByteSequence value)
{
// If the value is null or empty, then it's not.
- if ((value == null) || value.length() == 0)
+ if (value == null || value.length() == 0)
{
return false;
}
@@ -319,21 +319,10 @@
}
}
- if ((closingBracePos < 0) || (closingBracePos == 1))
- {
- return false;
- }
-
-
- // The closing curly brace must not be the last character of the password.
- if (closingBracePos == (value.length() - 1))
- {
- return false;
- }
-
-
- // If we've gotten here, then it looks to be encoded.
- return true;
+ return closingBracePos >= 0
+ && closingBracePos != 1
+ // The closing curly brace must not be the last character of the password.
+ && closingBracePos != value.length() - 1;
}
--
Gitblit v1.10.0