From 67405dde9ba213331dab1fc46cb18c485070fd5b Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 05 Jun 2009 09:04:50 +0000
Subject: [PATCH] svn merge -r5333:5417 https://opends.dev.java.net/svn/opends/branches/b2.0
---
opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigReader.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigReader.java b/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigReader.java
index 3b4b154..b961f62 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigReader.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigReader.java
@@ -46,6 +46,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryEnvironmentConfig;
+import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
import org.opends.server.types.OpenDsException;
import org.opends.server.types.Schema;
@@ -276,8 +277,11 @@
* @throws ConfigException if an error occurs reading the schema.
* @throws InitializationException if an error occurs trying to find out
* the schema files.
+ * @throws DirectoryException if there is an error registering the minimal
+ * objectclasses.
*/
- protected void readSchema() throws ConfigException, InitializationException
+ protected void readSchema() throws ConfigException, InitializationException,
+ DirectoryException
{
SchemaLoader loader = new SchemaLoader();
loader.readSchema();
--
Gitblit v1.10.0