Author: ssmiweve
Date: 2008-11-17 22:04:44 +0100 (Mon, 17 Nov 2008)
New Revision: 6944
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/PropertiesCommandConfig.java
Log:
don't load the properties file is it hasn't been specified
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/PropertiesCommandConfig.java
===================================================================
---
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/PropertiesCommandConfig.java
2008-11-17 14:34:35 UTC (rev 6943)
+++
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/PropertiesCommandConfig.java
2008-11-17 21:04:44 UTC (rev 6944)
@@ -78,12 +78,15 @@
AbstractDocumentFactory.fillBeanProperty(this, inherit,
"propertiesFilename", ParseType.String, element, "");
final Properties props = new Properties();
- context.newPropertiesLoader(context, propertiesFilename +
".properties", props).abut();
+ final Map<String,String> map = new HashMap<String,String>();
- final Map<String,String> map = new HashMap<String,String>();
- for(Map.Entry<Object,Object> entry : props.entrySet()){
- if(entry.getValue() instanceof String){
- map.put((String)entry.getKey(), (String)entry.getValue());
+ if(0 < propertiesFilename.length()){
+ context.newPropertiesLoader(context, propertiesFilename +
".properties", props).abut();
+
+ for(Map.Entry<Object,Object> entry : props.entrySet()){
+ if(entry.getValue() instanceof String){
+ map.put((String)entry.getKey(), (String)entry.getValue());
+ }
}
}
properties = Collections.unmodifiableMap(map);
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
