Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv5725
Modified Files:
ResourceLoader.java
Log Message:
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.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- ResourceLoader.java 11 Jul 2008 19:48:35 -0000 1.58
+++ ResourceLoader.java 11 Jul 2008 19:54:43 -0000 1.59
@@ -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.58 2008/07/11 19:48:35 michiel Exp $
+ * @version $Id: ResourceLoader.java,v 1.59 2008/07/11 19:54:43 michiel Exp $
*/
public class ResourceLoader extends ClassLoader {
@@ -1297,6 +1297,10 @@
super(true);
try {
FILES = ApplicationContextReader.getProperties("mmbase-config"
+ ResourceLoader.this.context.getPath());
+ } catch (javax.naming.NameNotFoundException nnfe) {
+ // never mind
+ log.debug(nnfe);
+ FILES = new HashMap<String, String>();
} catch (javax.naming.NamingException ne) {
log.error(ne);
FILES = new HashMap<String, String>();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
