Update of /var/cvs/src/org/mmbase/module/core
In directory james.mmbase.org:/tmp/cvs-serv15844
Modified Files:
MMBase.java
Log Message:
avoid NPE if running on war
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/core
Index: MMBase.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/core/MMBase.java,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -b -r1.241 -r1.242
--- MMBase.java 16 Apr 2008 12:19:33 -0000 1.241
+++ MMBase.java 25 Apr 2008 16:34:04 -0000 1.242
@@ -43,7 +43,7 @@
* @author Pierre van Rooden
* @author Johannes Verelst
* @author Ernst Bunders
- * @version $Id: MMBase.java,v 1.241 2008/04/16 12:19:33 michiel Exp $
+ * @version $Id: MMBase.java,v 1.242 2008/04/25 16:34:04 michiel Exp $
*/
public class MMBase extends ProcessorModule {
@@ -1328,7 +1328,7 @@
File dataDir = new File(dataDirString);
if (! dataDir.isAbsolute()) {
- if (sc != null) {
+ if (sc != null && sc.getRealPath("/" + dataDirString) != null) {
dataDir = new File(sc.getRealPath("/" + dataDirString));
} else {
dataDir = new File(System.getProperty("user.dir"),
dataDirString);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
