commit 0e1417e5f0fe1c431a499c1e8b57f8c7f34e8905
author Kiran Ayyagari <kayyagari@apache.org> Sat Jan 16 15:24:26 2010 +0000
committer Kiran Ayyagari <kayyagari@apache.org> Sat Jan 16 15:24:26 2010 +0000
tree 4b50e405b63920528fe742df9a44725ef656e108
parent 5aa1b92574a8338227b9bbd35d9c4b0fe70d44c3

o removed lines throwing exceptions when optional server config is not found
o added a note in the getDirectoryService() method describing why throwing an exception is required


git-svn-id: https://svn.apache.org/repos/asf/directory/apacheds/branches/apacheds-cidit@899975 13f79535-47bb-0310-9956-ffa450edef68

default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java

diff --git a/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java b/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
index 8a9f5d7..e60cb72 100644
--- a/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
+++ b/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
@@ -164,7 +164,8 @@
 
         if ( !cursor.next() )
         {
-            throw new Exception( "No LDAP server was configured under the DN " + configPartition.getSuffixDn() );
+            LOG.warn( "No LDAP server was configured under the DN {}", configPartition.getSuffixDn() );
+            return null;
         }
 
         ForwardIndexEntry<Long, Long> forwardEntry = ( ForwardIndexEntry<Long, Long> ) cursor.get();
@@ -200,7 +201,8 @@
 
         if ( !cursor.next() )
         {
-            throw new Exception( "No kerberos server was configured under the DN " + configPartition.getSuffixDn() );
+            LOG.warn( "No kerberos server was configured under the DN {}", configPartition.getSuffixDn() );
+            return null;
         }
 
         ForwardIndexEntry<Long, Long> forwardEntry = ( ForwardIndexEntry<Long, Long> ) cursor.get();
@@ -325,7 +327,8 @@
 
         if ( !cursor.next() )
         {
-            throw new Exception( "No DNS server was configured under the DN " + configPartition.getSuffixDn() );
+            LOG.warn( "No DNS server was configured under the DN {}", configPartition.getSuffixDn() );
+            return null;
         }
 
         ForwardIndexEntry<Long, Long> forwardEntry = ( ForwardIndexEntry<Long, Long> ) cursor.get();
@@ -363,7 +366,8 @@
 
         if ( !cursor.next() )
         {
-            throw new Exception( "No DHCP server was configured under the DN " + configPartition.getSuffixDn() );
+            LOG.warn( "No DHCP server was configured under the DN {}", configPartition.getSuffixDn() );
+            return null;
         }
 
         ForwardIndexEntry<Long, Long> forwardEntry = ( ForwardIndexEntry<Long, Long> ) cursor.get();
@@ -394,7 +398,8 @@
 
         if ( !cursor.next() )
         {
-            throw new Exception( "No NTP server was configured under the DN " + configPartition.getSuffixDn() );
+            LOG.warn( "No NTP server was configured under the DN {}", configPartition.getSuffixDn() );
+            return null;
         }
 
         ForwardIndexEntry<Long, Long> forwardEntry = ( ForwardIndexEntry<Long, Long> ) cursor.get();
@@ -431,7 +436,8 @@
 
         if ( !cursor.next() )
         {
-            throw new Exception( "No HTTP server was configured under the DN " + configPartition.getSuffixDn() );
+            LOG.warn( "No HTTP server was configured under the DN {}", configPartition.getSuffixDn() );
+            return null;
         }
 
         ForwardIndexEntry<Long, Long> forwardEntry = ( ForwardIndexEntry<Long, Long> ) cursor.get();
@@ -490,6 +496,7 @@
 
         if ( !cursor.next() )
         {
+            // the DirectoryService is mandatory so throwing exception
             throw new Exception( "No directoryService instance was configured under the DN "
                 + configPartition.getSuffixDn() );
         }