svn commit: r962537 - /incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/DBInterfaceDerby.java

[kw...@apache.org]

Author: kwright
Date: Fri Jul  9 14:07:10 2010
New Revision: 962537

URL: http://svn.apache.org/viewvc?rev=962537&view=rev
Log:
Missed a place where we are getting a file location that should be relative.

Modified:
    incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/DBInterfaceDerby.java

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/DBInterfaceDerby.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/DBInterfaceDerby.java?rev=962537&r1=962536&r2=962537&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/DBInterfaceDerby.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/database/DBInterfaceDerby.java Fri Jul  9 14:07:10 2010
@@ -46,13 +46,13 @@ public class DBInterfaceDerby extends Da
   protected static String getFullDatabasePath(String databaseName)
     throws LCFException
   {
-    String path = LCF.getProperty(databasePathProperty);
+    File path = LCF.getFileProperty(databasePathProperty);
     if (path == null)
-      throw new LCFException("Derby database requires '"+databasePathProperty+"' property, containing a full path");
-    path = path.replace("\\\\","/");
-    if (!path.endsWith("/"))
-      path = path + "/";
-    return path + databaseName;
+      throw new LCFException("Derby database requires '"+databasePathProperty+"' property, containing a relative path");
+    String pathString = path.toString().replace("\\\\","/");
+    if (!pathString.endsWith("/"))
+      pathString = pathString + "/";
+    return pathString + databaseName;
   }
   
   public DBInterfaceDerby(IThreadContext tc, String databaseName, String userName, String password)