Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv6969
Modified Files:
ResourceLoader.java
Log Message:
Log less warning if happend to run outside application context (e.g. test-cases)
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.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- ResourceLoader.java 11 Jul 2008 21:15:04 -0000 1.60
+++ ResourceLoader.java 15 Jul 2008 11:23:03 -0000 1.61
@@ -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.60 2008/07/11 21:15:04 michiel Exp $
+ * @version $Id: ResourceLoader.java,v 1.61 2008/07/15 11:23:03 michiel Exp $
*/
public class ResourceLoader extends ClassLoader {
@@ -335,7 +335,6 @@
configRoot.roots.add(configRoot.new
ApplicationContextFileURLStreamHandler());
-
if (configPath != null) {
if (servletContext != null) {
// take into account that configpath can start at
webrootdir
@@ -1307,6 +1306,10 @@
// never mind
log.debug(nnfe);
FILES = new HashMap<String, String>();
+ } catch (javax.naming.NoInitialContextException nice) {
+ // never mind
+ log.debug(nice);
+ 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
