Assume the 'workflow' as default classLoaderSharing git-svn-id: http://taverna.googlecode.com/svn/taverna/engine/net.sf.taverna.t2.activities/trunk/dependency-activity@15911 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/4b383f5b Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/4b383f5b Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/4b383f5b Branch: refs/heads/master Commit: 4b383f5b826951ba3ca2b981462e8c8cbbc969cc Parents: 10b1750 Author: [email protected] <[email protected]@bf327186-88b3-11dd-a302-d386e5130c1c> Authored: Tue Jul 23 12:23:52 2013 +0000 Committer: [email protected] <[email protected]@bf327186-88b3-11dd-a302-d386e5130c1c> Committed: Tue Jul 23 12:23:52 2013 +0000 ---------------------------------------------------------------------- .../AbstractAsynchronousDependencyActivity.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/4b383f5b/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 fbd31d2..4eb4799 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 @@ -95,7 +95,14 @@ public abstract class AbstractAsynchronousDependencyActivity extends AbstractAsy * */ public static enum ClassLoaderSharing { - workflow, system + workflow, system; + public static final ClassLoaderSharing DEFAULT = workflow; + public static ClassLoaderSharing fromString(String str) { + if (str == null || str.isEmpty()) { + return DEFAULT; + } + return valueOf(str.toLowerCase()); + } } public AbstractAsynchronousDependencyActivity(ApplicationConfiguration applicationConfiguration) { @@ -128,7 +135,7 @@ public abstract class AbstractAsynchronousDependencyActivity extends AbstractAsy * classloader sharing policy */ protected ClassLoader findClassLoader(JsonNode json, String workflowRunID) throws RuntimeException{ - ClassLoaderSharing classLoaderSharing = ClassLoaderSharing.valueOf(json.get("classLoaderSharing").textValue()); + ClassLoaderSharing classLoaderSharing = ClassLoaderSharing.fromString(json.get("classLoaderSharing").textValue()); if (classLoaderSharing == ClassLoaderSharing.workflow) { synchronized (workflowClassLoaders) {
