From 98d7fe202b3aca391c3bfe7e018077fbf0844f35 Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Wed, 27 May 2015 14:17:06 +0000
Subject: [PATCH] OPENDJ-2047 CR-7061 SDK AttributeTypeSyntax should accept no space before closing parentheses
---
opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java | 2 ++
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaUtils.java | 1 -
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/AttributeTypeSyntaxTest.java | 1 +
3 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaUtils.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaUtils.java
index f72569e..7158c2b 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaUtils.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaUtils.java
@@ -135,7 +135,6 @@
if (c == '\'') {
reader.reset();
values = Collections.singletonList(readQuotedDescriptor(reader, allowCompatChars));
- reader.read();
} else if (c == '(') {
// Skip over any leading spaces
reader.skipWhitespaces();
diff --git a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java
index 834d4ba..848f2ea 100644
--- a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java
+++ b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java
@@ -55,6 +55,8 @@
+ " SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE"
+ " COLLECTIVE USAGE userApplications )", true },
{
+ "(1.2.8.5 NAME 'testtype')", true },
+ {
"(1.2.8.5 NAME 'testtype' DESC 'full type')", true },
{
"(1.2.8.5 NAME 'testType' DESC 'full type' EQUALITY caseIgnoreMatch "
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/AttributeTypeSyntaxTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/AttributeTypeSyntaxTest.java
index 44bec83..186109a 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/AttributeTypeSyntaxTest.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/AttributeTypeSyntaxTest.java
@@ -79,6 +79,7 @@
" SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE" +
" COLLECTIVE USAGE userApplications )",
true},
+ {"(1.2.8.5 NAME 'testtype')", true},
{"(1.2.8.5 NAME 'testtype' DESC 'full type')",
true},
{"(1.2.8.5 NAME 'testType' DESC 'full type' EQUALITY caseIgnoreMatch " +
--
Gitblit v1.10.0