From d94f6d23898f7515e969517f85b8e626667a1e02 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 19 Sep 2014 08:56:38 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1536: Rename ErrorResultException to LdapException and remove ErrorResultIOException

---
 opendj-config/src/main/java/org/forgerock/opendj/config/conditions/Conditions.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/Conditions.java b/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/Conditions.java
index 3340b4c..44d9142 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/Conditions.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/Conditions.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2014 ForgeRock AS
  */
 package org.forgerock.opendj.config.conditions;
 
@@ -30,7 +31,7 @@
 import org.forgerock.opendj.config.client.ManagementContext;
 import org.forgerock.opendj.config.server.ConfigException;
 import org.forgerock.opendj.config.server.ServerManagedObject;
-import org.forgerock.opendj.ldap.ErrorResultException;
+import org.forgerock.opendj.ldap.LdapException;
 
 /**
  * This class consists exclusively of static methods that operate on or return
@@ -46,7 +47,7 @@
         /**
          * {@inheritDoc}
          */
-        public boolean evaluate(ManagementContext context, ManagedObject<?> managedObject) throws ErrorResultException {
+        public boolean evaluate(ManagementContext context, ManagedObject<?> managedObject) throws LdapException {
             return false;
         }
 
@@ -74,7 +75,7 @@
         /**
          * {@inheritDoc}
          */
-        public boolean evaluate(ManagementContext context, ManagedObject<?> managedObject) throws ErrorResultException {
+        public boolean evaluate(ManagementContext context, ManagedObject<?> managedObject) throws LdapException {
             return true;
         }
 

--
Gitblit v1.10.0