From d46701cdbecec6f6c10f57432f3e6a484752f42c Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Sat, 18 Jan 2014 00:55:24 +0000
Subject: [PATCH] Simplify config framework exception hierarchy by removing and pulling up the following exceptions:

---
 opendj3-server-dev/src/server/org/opends/server/admin/DNPropertyDefinition.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/DNPropertyDefinition.java b/opendj3-server-dev/src/server/org/opends/server/admin/DNPropertyDefinition.java
index 51b2d52..1a0742b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/DNPropertyDefinition.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/DNPropertyDefinition.java
@@ -171,7 +171,7 @@
    */
   @Override
   public void validateValue(DN value)
-      throws IllegalPropertyValueException {
+      throws PropertyException {
     ifNull(value);
 
     if (baseDN != null) {
@@ -182,7 +182,7 @@
       }
 
       if (!parent.equals(baseDN)) {
-        throw new IllegalPropertyValueException(this, value);
+        throw PropertyException.illegalPropertyValueException(this, value);
       }
     }
   }
@@ -194,7 +194,7 @@
    */
   @Override
   public DN decodeValue(String value)
-      throws IllegalPropertyValueStringException {
+      throws PropertyException {
     ifNull(value);
 
     try {
@@ -202,9 +202,9 @@
       validateValue(dn);
       return dn;
     } catch (DirectoryException e) {
-      throw new IllegalPropertyValueStringException(this, value);
-    } catch (IllegalPropertyValueException e) {
-      throw new IllegalPropertyValueStringException(this, value);
+      throw PropertyException.illegalPropertyValueException(this, value);
+    } catch (PropertyException e) {
+      throw PropertyException.illegalPropertyValueException(this, value);
     }
   }
 

--
Gitblit v1.10.0