Skip to content

Commit b39cdfa

Browse files
committed
Supplying -moduledir is not required
1 parent e42f373 commit b39cdfa

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceRemoteIntegrationTests.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,21 @@ protected void executeJobRemote(File workDir, @Nullable File jobJson) throws IOE
184184
args.add(System.getProperty("java.home") + "/bin/java" + (SystemUtils.IS_OS_WINDOWS ? ".exe" : ""));
185185

186186
File labkeyBootstrap = new File(System.getProperty("catalina.home"), "lib/labkeyBootstrap.jar");
187+
if (!labkeyBootstrap.exists())
188+
{
189+
throw new IOException("Unable to find labkeyBootstrap.jar, expected: " + labkeyBootstrap.getPath());
190+
}
191+
187192
args.add("-cp");
188193
args.add(labkeyBootstrap.getPath());
189194
args.add("org.labkey.bootstrap.ClusterBootstrap");
190195

191196
File webappDir = new File(ModuleLoader.getServletContext().getRealPath(""));
197+
if (!webappDir.exists())
198+
{
199+
throw new IOException("Unable to find webappdir, expected: " + webappDir.getPath());
200+
}
192201

193-
args.add("-modulesdir=" + new File(webappDir.getParentFile(), "modules").getPath());
194202
args.add("-webappdir=" + webappDir.getPath());
195203

196204
File configDir = setupConfigDir(workDir);

0 commit comments

Comments
 (0)