From aad596c8559b3d3d081617736cdbeda1374f017b Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 11 May 2012 21:58:30 +0000
Subject: [PATCH] Fix OPENDJ-482: Validation for the CertificateSyntax
---
opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java b/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
index 4f76afe..9b02cc1 100644
--- a/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
+++ b/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2012 ForgeRock AS
*/
package org.opends.server.schema;
@@ -473,7 +473,7 @@
StringBuilder woidBuffer = new StringBuilder();
pos = readQuotedString(valueStr, woidBuffer, pos);
String syntaxOID = toLowerCase(woidBuffer.toString());
- AttributeSyntax subSyntax = schema.getSyntax(syntaxOID);
+ AttributeSyntax<?> subSyntax = schema.getSyntax(syntaxOID);
if (subSyntax == null)
{
Message message = ERR_ATTR_SYNTAX_LDAPSYNTAX_UNKNOWN_SYNTAX.get(
@@ -933,6 +933,16 @@
/**
+ * {@inheritDoc}
+ */
+ public boolean isHumanReadable()
+ {
+ return true;
+ }
+
+
+
+ /**
* This class provides a substitution mechanism where one unimplemented
* syntax can be substituted by another defined syntax. A substitution syntax
* is an LDAPSyntaxDescriptionSyntax with X-SUBST extension.
@@ -941,7 +951,7 @@
LDAPSyntaxDescriptionSyntax
{
// The syntax that will subsittute the unimplemented syntax.
- private AttributeSyntax subSyntax;
+ private AttributeSyntax<?> subSyntax;
// The description of this syntax.
private String description;
@@ -956,7 +966,7 @@
//Creates a new instance of this syntax.
- private SubstitutionSyntax(AttributeSyntax subSyntax,
+ private SubstitutionSyntax(AttributeSyntax<?> subSyntax,
String definition,
String description,
String oid)
--
Gitblit v1.10.0