| commit | b68f7b1f846773d09bde9a718c22f20aeb9786ae | [log] [tgz] |
|---|---|---|
| author | Stian Soiland-Reyes <stain@apache.org> | Fri Nov 10 14:55:23 2017 +0000 |
| committer | Stian Soiland-Reyes <stain@apache.org> | Fri Nov 10 14:55:23 2017 +0000 |
| tree | 98f6d1e7ba2058721df66819bad5a61649a85cce | |
| parent | 20916ddcf52ba8dce4cff1c124a2a015c7986812 [diff] |
Support both Taverna 2.5 and 3.1 command line folder as Taverna 3 uses "taverna-command-line" folder name
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/LocalWorkerState.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/LocalWorkerState.java index e5bb938..8ca05cc 100644 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/LocalWorkerState.java +++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/LocalWorkerState.java
@@ -210,7 +210,9 @@ File[] dirs = utilDir.listFiles(new FilenameFilter() { @Override public boolean accept(File dir, String name) { - return name.startsWith("taverna-commandline-"); + // Support both taverna-commandline* (2.5) and + // taverna-command-line* (3.1) + return name.startsWith("taverna-command"); } }); assert dirs.length > 0; @@ -464,4 +466,4 @@ loadedState = true; } -} \ No newline at end of file +}