From 06ec8c88556b02782c7b91a233de91eaf4a1439d Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 09 Jun 2009 12:28:05 +0000
Subject: [PATCH] Fix for issue 3550 (Consider making the control panel able to manage remote servers)
---
opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java b/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java
index a26bbaf..c4aefb3 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java
@@ -110,6 +110,25 @@
try
{
DirectoryServer.getInstance().initializeConfiguration();
+
+ if (mustReadSchema())
+ {
+ try
+ {
+ readSchema();
+ if (getSchema() != null)
+ {
+ // Update the schema: so that when we call the server code the
+ // latest schema read on the server we are managing is used.
+ DirectoryServer.setSchema(getSchema());
+ }
+ }
+ catch (OpenDsException oe)
+ {
+ ex.add(oe);
+ }
+ }
+
// Get the Directory Server configuration handler and use it.
RootCfg root =
ServerManagementContext.getInstance().getRootConfiguration();
@@ -343,18 +362,6 @@
{
ex.add(oe);
}
-
- if (mustReadSchema())
- {
- try
- {
- readSchema();
- }
- catch (OpenDsException oe)
- {
- ex.add(oe);
- }
- }
}
catch (OpenDsException oe)
{
--
Gitblit v1.10.0