Update of /var/cvs/src/org/mmbase/storage/implementation/database
In directory
james.mmbase.org:/tmp/cvs-serv11876/src/org/mmbase/storage/implementation/database
Modified Files:
GenericDataSource.java
Log Message:
avoid NullPointerException
See also:
http://cvs.mmbase.org/viewcvs/src/org/mmbase/storage/implementation/database
Index: GenericDataSource.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/storage/implementation/database/GenericDataSource.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- GenericDataSource.java 21 Mar 2008 13:44:23 -0000 1.17
+++ GenericDataSource.java 11 Apr 2008 11:42:02 -0000 1.18
@@ -33,7 +33,7 @@
* @author Pierre van Rooden
* @author Michiel Meeuwissen
* @since MMBase-1.7
- * @version $Id: GenericDataSource.java,v 1.17 2008/03/21 13:44:23 michiel Exp
$
+ * @version $Id: GenericDataSource.java,v 1.18 2008/04/11 11:42:02 pierre Exp $
*/
public final class GenericDataSource implements DataSource {
private static final Logger log =
Logging.getLoggerInstance(GenericDataSource.class);
@@ -210,13 +210,14 @@
}
}
String url = jdbc.makeUrl();
- String data;
+ String data = "";
+ if (dataDir !=null) {
try {
data = dataDir.getCanonicalPath();
} catch (Exception e) {
log.error(e + " Falling back to " + dataDir);
data = dataDir.toString();
-
+ }
}
String newUrl = url.replaceAll("\\$DATADIR", data + File.separator);
if ((!basePathOk) && (! newUrl.equals(url))) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
