Author: mickw
Date: 2006-05-01 14:17:16 +0200 (Mon, 01 May 2006)
New Revision: 2835
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/configuration/SiteConfiguration.java
Log:
only ever once call .abut() on the property loader, otherwise it will through a
InterruptedException
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/configuration/SiteConfiguration.java
===================================================================
---
trunk/src/java/no/schibstedsok/front/searchportal/configuration/SiteConfiguration.java
2006-05-01 11:24:04 UTC (rev 2834)
+++
trunk/src/java/no/schibstedsok/front/searchportal/configuration/SiteConfiguration.java
2006-05-01 12:17:16 UTC (rev 2835)
@@ -38,13 +38,9 @@
private static final Logger LOG =
Logger.getLogger(SiteConfiguration.class);
-
-
private SiteConfiguration(final Context cxt) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Configuration()");
- }
+ LOG.debug("Configuration()");
context = cxt;
@@ -56,7 +52,10 @@
}
public Properties getProperties() {
- propertyLoader.abut();
+
+ if( properties.size() == 0 ){
+ propertyLoader.abut();
+ }
return properties;
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
