Merge remote-tracking branch 'upstream/master'

Former-commit-id: 707e6e699e0a0a51bd4d808a0fab777684e70d32
This commit is contained in:
Will Stranathan
2014-01-23 20:42:42 -05:00

View File

@@ -97,7 +97,7 @@ public class DriverLoaderTest {
final File testClassPath = (new File(this.getClass().getClassLoader().getResource("org.mortbay.jetty.jar").getPath())).getParentFile();
final File dir1 = new File(testClassPath, "../../src/test/");
final File dir2 = new File(testClassPath, "../../src/test/resources/");
final String paths = String.format("%s;%s", dir1.getAbsolutePath(), dir2.getAbsolutePath());
final String paths = String.format("%s" + File.pathSeparator + "%s", dir1.getAbsolutePath(), dir2.getAbsolutePath());
DriverLoader.load(className, paths);
}