ozeigermann 2004/04/27 05:55:57
Modified: src/share/org/apache/slide/common Namespace.java
Log:
Made configuration exception more graceful when definition is just not there
Revision Changes Path
1.61 +14 -10 jakarta-slide/src/share/org/apache/slide/common/Namespace.java
Index: Namespace.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- Namespace.java 27 Apr 2004 09:21:16 -0000 1.60
+++ Namespace.java 27 Apr 2004 12:55:57 -0000 1.61
@@ -973,11 +973,16 @@
}
- private void getChildStore(Configuration storeDefinition, String key, Hashtable
currentStoreChildStores, Hashtable storeParameters)
+ private void getChildStore(Configuration storeDefinition, String key, Hashtable
currentStoreChildStores, Hashtable storeParameters) throws SlideException
{
+ Configuration localStoreDefinition;
+ try {
+ localStoreDefinition = storeDefinition.getConfiguration(key);
+ } catch (ConfigurationException e) {
+ return;
+ // silently ignore as this only indicates there is no such store defined
+ }
try {
- Configuration localStoreDefinition =
- storeDefinition.getConfiguration(key);
try {
Configuration referenceDefinition =
localStoreDefinition.getConfiguration(REFERENCE);
@@ -989,13 +994,12 @@
Service store =
loadChildStore(localStoreDefinition,
storeParameters);
-
if (store != null) {
currentStoreChildStores.put(key, store);
}
}
- } catch (Exception e) {
- getLogger().log("Exception while loading "+key+"!", e, LOG_CHANNEL,
Logger.ERROR);
+ } catch (ConfigurationException e) {
+ getLogger().log("Exception while loading "+key+"!", e, LOG_CHANNEL,
Logger.WARNING);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
