From e6e55855e28f061ad6662ac45373e56e6770307d Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Mon, 22 Oct 2007 10:33:09 +0000
Subject: [PATCH] Fix issue 2286: class properties would allow empty class names.
---
opends/src/server/org/opends/server/admin/ClassPropertyDefinition.java | 3 +--
opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ClassPropertyDefinitionTest.java | 3 +++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/admin/ClassPropertyDefinition.java b/opends/src/server/org/opends/server/admin/ClassPropertyDefinition.java
index 8b6e162..f21df33 100644
--- a/opends/src/server/org/opends/server/admin/ClassPropertyDefinition.java
+++ b/opends/src/server/org/opends/server/admin/ClassPropertyDefinition.java
@@ -131,8 +131,7 @@
// Regular expression for validating class names.
private static final String CLASS_RE =
- "^([A-Za-z]+[A-Za-z0-9_]*)*(\\.[A-Za-z]+[A-Za-z0-9_]*)"
- + "*([\\$][A-Za-z0-9_]+)*$";
+ "^([A-Za-z][A-Za-z0-9_]*\\.)*[A-Za-z][A-Za-z0-9_]*(\\$[A-Za-z0-9_]+)*$";
// Flag indicating whether class property values should be
// validated.
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ClassPropertyDefinitionTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ClassPropertyDefinitionTest.java
index 5d55782..dbcc52f 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ClassPropertyDefinitionTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ClassPropertyDefinitionTest.java
@@ -93,6 +93,9 @@
public Object[][] createBuilderAddInstanceOfData2() {
return new Object[][]{
{ "1" },
+ { "" },
+ { " " },
+ { " " },
{ "abc." },
{ "abc.123" },
{ "abc.123$" },
--
Gitblit v1.10.0