Update of /var/cvs/src/org/mmbase/servlet
In directory james.mmbase.org:/tmp/cvs-serv32122
Modified Files:
Tag: MMBase-1_8
MMBaseServlet.java
Log Message:
handle also cache.path=<empty string> setting
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/servlet
Index: MMBaseServlet.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/servlet/MMBaseServlet.java,v
retrieving revision 1.53.2.8
retrieving revision 1.53.2.9
diff -u -b -r1.53.2.8 -r1.53.2.9
--- MMBaseServlet.java 28 Nov 2007 17:07:46 -0000 1.53.2.8
+++ MMBaseServlet.java 18 Feb 2008 14:56:03 -0000 1.53.2.9
@@ -39,7 +39,7 @@
* store a MMBase instance for all its descendants, but it can also be used as
a serlvet itself, to
* show MMBase version information.
*
- * @version $Id: MMBaseServlet.java,v 1.53.2.8 2007/11/28 17:07:46 michiel Exp
$
+ * @version $Id: MMBaseServlet.java,v 1.53.2.9 2008/02/18 14:56:03 michiel Exp
$
* @author Michiel Meeuwissen
* @since MMBase-1.6
*/
@@ -168,7 +168,7 @@
if (is != null) {
p.load(is);
}
- if (p.getProperty("cache.path") == null) {
+ if (p.getProperty("cache.path") == null ||
"".equals(p.getProperty("cache.path"))) {
p.setProperty("cache.path",
mmb.getInitParameter("datadir") + java.io.File.separator + "oscache");
}
@@ -176,7 +176,7 @@
Method m = osCache.getMethod("getInstance", new Class []
{ServletContext.class, Properties.class});
m.invoke(null, new Object[] { getServletContext(), p});
log.service("Using " + p + " for oscache");
- } catch (Exception e) {
+ } catch (Throwable e) {
log.service(e.getMessage());
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
