--- projects/cms/source/server/uk/org/iscream/cms/server/core/ConfigurationManagerServant.java	2001/03/01 19:25:41	1.9
+++ projects/cms/source/server/uk/org/iscream/cms/server/core/ConfigurationManagerServant.java	2001/03/01 19:36:08	1.10
@@ -24,7 +24,7 @@ import java.io.*;
  * ###
  *
  * @author  $Author: ajm $
- * @version $Id: ConfigurationManagerServant.java,v 1.9 2001/03/01 19:25:41 ajm Exp $
+ * @version $Id: ConfigurationManagerServant.java,v 1.10 2001/03/01 19:36:08 ajm Exp $
  */
 class ConfigurationManagerServant extends ConfigurationManagerPOA {
 
@@ -33,7 +33,7 @@ class ConfigurationManagerServant extends Configuratio
     /**
      * The current CVS revision of this class
      */
-    public final String REVISION = "$Revision: 1.9 $";
+    public final String REVISION = "$Revision: 1.10 $";
     
 //---STATIC METHODS---
 
@@ -105,13 +105,17 @@ class ConfigurationManagerServant extends Configuratio
             _logger.write(toString(), Logger.DEBUG, "looking for config tree in - " + configFile);
 
             // get the file list of includes etc + the system config
+            String groupFileList = null;
             try {
-                fileList += getIncludedFiles(configFile, "") + ";";
+                groupFileList = getIncludedFiles(configFile, "") + ";";
             } catch (Exception e) {
                 // not sure what to do here
                 // so we just log the error
-                _logger.write(toString(), Logger.ERROR, "ERROR - " + e.getMessage());
+                _logger.write(toString(), Logger.ERROR, "ERROR - " + e);
             }
+            if (groupFileList != null) {
+                fileList += groupFileList;
+            }
         }
         // add the system config as the final check
         fileList += _systemConfigFile + ";";
@@ -298,7 +302,7 @@ class ConfigurationManagerServant extends Configuratio
         Configuration config = null;
 
         // if there is an entry
-        if (fileList != null) {
+        if (!fileList.equals("")) {
             try {
                 
                 // build the properites here from the filelist.... 
@@ -338,7 +342,7 @@ class ConfigurationManagerServant extends Configuratio
             } catch (Exception e) {
                 // not sure what to do here
                 // so we just log the error
-                _logger.write(toString(), Logger.ERROR, "ERROR - " + e.getMessage());
+                _logger.write(toString(), Logger.ERROR, "ERROR - " + e);
             }
             
         // if there isn't an entry for the requested config