public constructor also avoid NPE
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/b4eb4ede Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/b4eb4ede Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/b4eb4ede Branch: refs/heads/cwl-browse Commit: b4eb4ede9e789c8ff185e8912607c962d359e0e4 Parents: 7798d41 Author: Stian Soiland-Reyes <st...@apache.org> Authored: Thu Sep 22 12:28:05 2016 +0100 Committer: Stian Soiland-Reyes <st...@apache.org> Committed: Thu Sep 22 12:28:05 2016 +0100 ---------------------------------------------------------------------- .../taverna/cwl/ui/serviceprovider/CwlServiceProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b4eb4ede/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceProvider.java ---------------------------------------------------------------------- diff --git a/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceProvider.java b/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceProvider.java index a1e2561..77b89bd 100644 --- a/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceProvider.java +++ b/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceProvider.java @@ -56,7 +56,7 @@ public class CwlServiceProvider extends AbstractConfigurableServiceProvider impl public static final String COMMONWL = "commonwl/"; private static Logger logger = Logger.getLogger(CwlServiceProvider.class); - CwlServiceProvider() { + public CwlServiceProvider() { // FIXME super(getDefaultConfiguration()); } @@ -136,7 +136,7 @@ public class CwlServiceProvider extends AbstractConfigurableServiceProvider impl private List<Path> getPath() { String userInput = getConfiguration().getJsonAsObjectNode().get("path").asText(); // If user haven't provided a PATH - if (userInput.isEmpty()||userInput==null) { + if (userInput==null || userInput.isEmpty()) { List<Path> defaultPaths = new ArrayList<>(); addPath(defaultPaths, DEFAULT_PATH_1, null); addPath(defaultPaths, DEFAULT_PATH_2, null);
