From 0bbb2f7f7f74de8b6a43523c88ae7eb8ff8b5e54 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 11 Mar 2014 09:41:21 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1308 Migrate schema support
---
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
index 999516f..89d3cfc 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
@@ -46,6 +46,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigException;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
@@ -566,22 +567,26 @@
*/
private void readSchema(InitialLdapContext ctx) throws OpenDsException
{
- if (isLocal)
+ try
{
- super.readSchema();
- }
- else
- {
- RemoteSchemaLoader loader = new RemoteSchemaLoader();
- try
+ if (isLocal)
{
+ super.readSchema();
+ }
+ else
+ {
+ RemoteSchemaLoader loader = new RemoteSchemaLoader();
loader.readSchema(ctx);
+ schema = loader.getSchema();
}
- catch (NamingException ne)
- {
- throw new OnlineUpdateException(ERR_READING_SCHEMA_LDAP.get(ne), ne);
- }
- schema = loader.getSchema();
+ }
+ catch (NamingException ne)
+ {
+ throw new OnlineUpdateException(ERR_READING_SCHEMA_LDAP.get(ne), ne);
+ }
+ catch (ConfigException ce)
+ {
+ throw new org.opends.server.config.ConfigException(ce.getMessageObject(), ce);
}
}
--
Gitblit v1.10.0