Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv10285
Modified Files:
Tag: MMBase-1_8
ResourceLoader.java
Log Message:
MMB-1666, depend on the fact that resoure is watched to reload the
configuration after servlet context is set
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util
See also: http://www.mmbase.org/jira/browse/MMB-1666
Index: ResourceLoader.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/ResourceLoader.java,v
retrieving revision 1.39.2.5
retrieving revision 1.39.2.6
diff -u -b -r1.39.2.5 -r1.39.2.6
--- ResourceLoader.java 17 Dec 2007 11:35:41 -0000 1.39.2.5
+++ ResourceLoader.java 23 Jun 2008 12:42:25 -0000 1.39.2.6
@@ -97,7 +97,7 @@
* <p>For property-files, the java-unicode-escaping is undone on loading, and
applied on saving, so there is no need to think of that.</p>
* @author Michiel Meeuwissen
* @since MMBase-1.8
- * @version $Id: ResourceLoader.java,v 1.39.2.5 2007/12/17 11:35:41 michiel
Exp $
+ * @version $Id: ResourceLoader.java,v 1.39.2.6 2008/06/23 12:42:25 michiel
Exp $
*/
public class ResourceLoader extends ClassLoader {
@@ -222,6 +222,16 @@
// reset both roots, they will be redetermined using servletContext.
configRoot = null;
webRoot = null;
+ Set rws = ResourceWatcher.resourceWatchers;
+ if (rws != null) {
+ synchronized(rws) {
+ Iterator j = rws.iterator();
+ while (j.hasNext()) {
+ ResourceWatcher rw = (ResourceWatcher) j.next();
+ rw.onChange();
+ }
+ }
+ }
}
/**
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
