bug fixes for issue #49

Former-commit-id: a5c7236f6d1663dc3004161d6e9e1d68a7bc6f06
This commit is contained in:
Jeremy Long
2014-01-23 21:25:59 -05:00
parent 22e6de19c4
commit 42a9f864eb
2 changed files with 2 additions and 3 deletions

View File

@@ -50,7 +50,7 @@ public final class DriverLoader {
* @throws DriverLoadException thrown if the driver cannot be loaded * @throws DriverLoadException thrown if the driver cannot be loaded
*/ */
public static void load(String className) throws DriverLoadException { public static void load(String className) throws DriverLoadException {
final ClassLoader loader = ClassLoader.getSystemClassLoader(); final ClassLoader loader = DriverLoader.class.getClassLoader(); //ClassLoader.getSystemClassLoader();
load(className, loader); load(className, loader);
} }

View File

@@ -284,8 +284,7 @@ public final class Settings {
Logger.getLogger(Settings.class.getName()).log(Level.FINE, "Settings.getDataFile() - transforming filename"); Logger.getLogger(Settings.class.getName()).log(Level.FINE, "Settings.getDataFile() - transforming filename");
final File jarPath = getJarPath(); final File jarPath = getJarPath();
Logger.getLogger(Settings.class.getName()).log(Level.FINE, String.format("Settings.getDataFile() - jar file: '%s'", jarPath.toString())); Logger.getLogger(Settings.class.getName()).log(Level.FINE, String.format("Settings.getDataFile() - jar file: '%s'", jarPath.toString()));
final File newBase = new File(jarPath, file.substring(6)); final File retVal = new File(jarPath, file.substring(6));
File retVal = new File(newBase, file);
Logger.getLogger(Settings.class.getName()).log(Level.FINE, String.format("Settings.getDataFile() - returning: '%s'", retVal.toString())); Logger.getLogger(Settings.class.getName()).log(Level.FINE, String.format("Settings.getDataFile() - returning: '%s'", retVal.toString()));
return retVal; return retVal;
} }