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/test/java/org/forgerock/opendj/config/TestParentCfgDefn.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgDefn.java b/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgDefn.java
index 4fc0cd0..1524cc7 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgDefn.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgDefn.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.forgerock.opendj.config;
@@ -40,7 +41,7 @@
import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
import org.forgerock.opendj.config.server.ServerManagedObject;
import org.forgerock.opendj.ldap.DN;
-import org.forgerock.opendj.ldap.ErrorResultException;
+import org.forgerock.opendj.ldap.LdapException;
import org.forgerock.opendj.ldap.schema.AttributeType;
/**
@@ -320,7 +321,7 @@
/**
* {@inheritDoc}
*/
- public String[] listTestChildren() throws ConcurrentModificationException, ErrorResultException {
+ public String[] listTestChildren() throws ConcurrentModificationException, LdapException {
return impl.listChildren(INSTANCE.getTestChildrenRelationDefinition());
}
@@ -329,7 +330,7 @@
*/
public TestChildCfgClient getTestChild(String name) throws DefinitionDecodingException,
ManagedObjectDecodingException, ManagedObjectNotFoundException, ConcurrentModificationException,
- ErrorResultException {
+ LdapException {
return impl.getChild(INSTANCE.getTestChildrenRelationDefinition(), name).getConfiguration();
}
@@ -346,14 +347,14 @@
* {@inheritDoc}
*/
public void removeTestChild(String name) throws ManagedObjectNotFoundException,
- ConcurrentModificationException, OperationRejectedException, ErrorResultException {
+ ConcurrentModificationException, OperationRejectedException, LdapException {
impl.removeChild(INSTANCE.getTestChildrenRelationDefinition(), name);
}
/**
* {@inheritDoc}
*/
- public boolean hasOptionalTestChild() throws ConcurrentModificationException, ErrorResultException {
+ public boolean hasOptionalTestChild() throws ConcurrentModificationException, LdapException {
return impl.hasChild(INSTANCE.getOptionalTestChildRelationDefinition());
}
@@ -362,7 +363,7 @@
*/
public TestChildCfgClient getOptionalChild() throws DefinitionDecodingException,
ManagedObjectDecodingException, ManagedObjectNotFoundException, ConcurrentModificationException,
- ErrorResultException {
+ LdapException {
return impl.getChild(INSTANCE.getOptionalTestChildRelationDefinition()).getConfiguration();
}
@@ -379,7 +380,7 @@
* {@inheritDoc}
*/
public void removeOptionalTestChild() throws ManagedObjectNotFoundException, ConcurrentModificationException,
- OperationRejectedException, ErrorResultException {
+ OperationRejectedException, LdapException {
impl.removeChild(INSTANCE.getOptionalTestChildRelationDefinition());
}
@@ -401,7 +402,7 @@
* {@inheritDoc}
*/
public void commit() throws ManagedObjectAlreadyExistsException, MissingMandatoryPropertiesException,
- ConcurrentModificationException, OperationRejectedException, ErrorResultException {
+ ConcurrentModificationException, OperationRejectedException, LdapException {
impl.commit();
}
--
Gitblit v1.10.0