Check for optional configuration property. git-svn-id: http://taverna.googlecode.com/svn/taverna/engine/net.sf.taverna.t2.activities/trunk/dependency-activity@15956 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/03671d7b Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/03671d7b Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/03671d7b Branch: refs/heads/master Commit: 03671d7b70487e93317e064f0f62a47741c2e0a2 Parents: 205fd9a Author: [email protected] <[email protected]@bf327186-88b3-11dd-a302-d386e5130c1c> Authored: Thu Jul 25 16:36:50 2013 +0000 Committer: [email protected] <[email protected]@bf327186-88b3-11dd-a302-d386e5130c1c> Committed: Thu Jul 25 16:36:50 2013 +0000 ---------------------------------------------------------------------- .../AbstractAsynchronousDependencyActivity.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/03671d7b/src/main/java/net/sf/taverna/t2/activities/dependencyactivity/AbstractAsynchronousDependencyActivity.java ---------------------------------------------------------------------- diff --git a/src/main/java/net/sf/taverna/t2/activities/dependencyactivity/AbstractAsynchronousDependencyActivity.java b/src/main/java/net/sf/taverna/t2/activities/dependencyactivity/AbstractAsynchronousDependencyActivity.java index 25c56f2..e2d5143 100644 --- a/src/main/java/net/sf/taverna/t2/activities/dependencyactivity/AbstractAsynchronousDependencyActivity.java +++ b/src/main/java/net/sf/taverna/t2/activities/dependencyactivity/AbstractAsynchronousDependencyActivity.java @@ -375,12 +375,14 @@ public abstract class AbstractAsynchronousDependencyActivity extends AbstractAsy AbstractAsynchronousDependencyActivity dependencyActivity = (AbstractAsynchronousDependencyActivity) activity; // if (dependencyType.equals(LOCAL_JARS)){ // Collect the files of all found local dependencies - for (JsonNode jar : dependencyActivity.getConfiguration().get("localDependency")) { - try { - dependencies.add(new File(libDir, jar.textValue())); - } catch (Exception ex) { - logger.warn("Invalid URL for " + jar, ex); - continue; + if (dependencyActivity.getConfiguration().has("localDependency")) { + for (JsonNode jar : dependencyActivity.getConfiguration().get("localDependency")) { + try { + dependencies.add(new File(libDir, jar.textValue())); + } catch (Exception ex) { + logger.warn("Invalid URL for " + jar, ex); + continue; + } } } // } else if (dependencyType.equals(ARTIFACTS) && this.getClass().getClassLoader() instanceof LocalArtifactClassLoader){
