Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv15843
Modified Files:
Tag: MMBase-1_8
ResourceLoader.java
Log Message:
small try/catch for usage with RMMCI
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util
Index: ResourceLoader.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/ResourceLoader.java,v
retrieving revision 1.39.2.15
retrieving revision 1.39.2.16
diff -u -b -r1.39.2.15 -r1.39.2.16
--- ResourceLoader.java 8 Dec 2008 12:59:12 -0000 1.39.2.15
+++ ResourceLoader.java 29 Jan 2009 13:13:51 -0000 1.39.2.16
@@ -98,7 +98,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.15 2008/12/08 12:59:12 michiel
Exp $
+ * @version $Id: ResourceLoader.java,v 1.39.2.16 2009/01/29 13:13:51 michiel
Exp $
*/
public class ResourceLoader extends ClassLoader {
@@ -335,8 +335,11 @@
//this deserves a warning message since the setting is masked
log.warn("mmbase.config system property is masked by
mmbase.config servlet context parameter");
}
-
+ try {
configRoot.roots.add(configRoot.new
ApplicationContextFileURLStreamHandler());
+ } catch (Throwable t) {
+ // Never mind, we may be in RMMCI (ClassNotFoundException)
+ }
if (configPath != null) {
if (servletContext != null) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
