From e0190b324fb92c3b82cd143d3aab1eeede951e94 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 16 Feb 2015 16:23:46 +0000
Subject: [PATCH] AutoRefactor: push negation down

---
 opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java
index 89dd1de..fd2ca2d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java
@@ -551,8 +551,9 @@
                   throw new DirectoryException(
                           ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
                 }
-                else if(!((ch>='0' && ch<='9') || (ch>='A' && ch<='Z') ||
-                        (ch>='a' && ch<='z')))
+                else if (!(('0'<=ch && ch<='9')
+                    || ('A'<=ch && ch<='Z')
+                    || ('a'<=ch && ch<='z')))
                 {
                   throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                       ERR_OC_SYNTAX_ATTR_ILLEGAL_CHAR.get(value, ch, index));
@@ -1226,8 +1227,7 @@
             lastWasPeriod = true;
           }
         }
-        else if (! (isDigit(c) ||
-                allowExceptions && (isAlpha(c) || (c=='-') || (c=='_'))))
+        else if ((!isDigit(c) && (!allowExceptions || (!isAlpha(c) && (c != '-') && (c != '_')))))
         {
           // Technically, this must be an illegal character.  However, it is
           // possible that someone just got sloppy and did not include a space

--
Gitblit v1.10.0