105 |
|
_logger.write(toString(), Logger.DEBUG, "looking for config tree in - " + configFile); |
106 |
|
|
107 |
|
// get the file list of includes etc + the system config |
108 |
+ |
String groupFileList = null; |
109 |
|
try { |
110 |
< |
fileList += getIncludedFiles(configFile, "") + ";"; |
110 |
> |
groupFileList = getIncludedFiles(configFile, "") + ";"; |
111 |
|
} catch (Exception e) { |
112 |
|
// not sure what to do here |
113 |
|
// so we just log the error |
114 |
< |
_logger.write(toString(), Logger.ERROR, "ERROR - " + e.getMessage()); |
114 |
> |
_logger.write(toString(), Logger.ERROR, "ERROR - " + e); |
115 |
|
} |
116 |
+ |
if (groupFileList != null) { |
117 |
+ |
fileList += groupFileList; |
118 |
+ |
} |
119 |
|
} |
120 |
|
// add the system config as the final check |
121 |
|
fileList += _systemConfigFile + ";"; |
302 |
|
Configuration config = null; |
303 |
|
|
304 |
|
// if there is an entry |
305 |
< |
if (fileList != null) { |
305 |
> |
if (!fileList.equals("")) { |
306 |
|
try { |
307 |
|
|
308 |
|
// build the properites here from the filelist.... |
342 |
|
} catch (Exception e) { |
343 |
|
// not sure what to do here |
344 |
|
// so we just log the error |
345 |
< |
_logger.write(toString(), Logger.ERROR, "ERROR - " + e.getMessage()); |
345 |
> |
_logger.write(toString(), Logger.ERROR, "ERROR - " + e); |
346 |
|
} |
347 |
|
|
348 |
|
// if there isn't an entry for the requested config |