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

---
 opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/IntegerPropertyDefinition.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/IntegerPropertyDefinition.java b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/IntegerPropertyDefinition.java
index a031f2e..9924207 100644
--- a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/IntegerPropertyDefinition.java
+++ b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/IntegerPropertyDefinition.java
@@ -233,15 +233,15 @@
         Reject.ifNull(value);
 
         if (!allowUnlimited && value < lowerLimit) {
-            throw new IllegalPropertyValueException(this, value);
+            throw PropertyException.illegalPropertyValueException(this, value);
 
             // unlimited allowed
         } else if (value >= 0 && value < lowerLimit) {
-            throw new IllegalPropertyValueException(this, value);
+            throw PropertyException.illegalPropertyValueException(this, value);
         }
 
         if ((upperLimit != null) && (value > upperLimit)) {
-            throw new IllegalPropertyValueException(this, value);
+            throw PropertyException.illegalPropertyValueException(this, value);
         }
     }
 
@@ -279,13 +279,13 @@
         try {
             i = Integer.valueOf(value);
         } catch (NumberFormatException e) {
-            throw new IllegalPropertyValueStringException(this, value);
+            throw PropertyException.illegalPropertyValueException(this, value);
         }
 
         try {
             validateValue(i, options);
-        } catch (IllegalPropertyValueException e) {
-            throw new IllegalPropertyValueStringException(this, value);
+        } catch (PropertyException e) {
+            throw PropertyException.illegalPropertyValueException(this, value);
         }
 
         return i;

--
Gitblit v1.10.0