Repository: airavata Updated Branches: refs/heads/master e53dd346b -> 5c00a8c5b
chking if zk exists Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5c00a8c5 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5c00a8c5 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5c00a8c5 Branch: refs/heads/master Commit: 5c00a8c5bd8b0c350be96b30d4ab58488d8c05cc Parents: e53dd34 Author: Saminda Wijeratne <[email protected]> Authored: Tue Jul 8 14:41:14 2014 -0400 Committer: Saminda Wijeratne <[email protected]> Committed: Tue Jul 8 14:41:14 2014 -0400 ---------------------------------------------------------------------- .../airavata/orchestrator/core/impl/GFACServiceJobSubmitter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/5c00a8c5/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/GFACServiceJobSubmitter.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/GFACServiceJobSubmitter.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/GFACServiceJobSubmitter.java index 212e892..d9df2fa 100644 --- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/GFACServiceJobSubmitter.java +++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/GFACServiceJobSubmitter.java @@ -74,7 +74,7 @@ public class GFACServiceJobSubmitter implements JobSubmitter, Watcher { public boolean submit(String experimentID, String taskID, String tokenId) throws OrchestratorException { ZooKeeper zk = orchestratorContext.getZk(); try { - if (!zk.getState().isConnected()) { + if (zk==null || !zk.getState().isConnected()) { String zkhostPort = ServerSettings.getSetting(org.apache.airavata.common.utils.Constants.ZOOKEEPER_SERVER_HOST) + ":" + ServerSettings.getSetting(org.apache.airavata.common.utils.Constants.ZOOKEEPER_SERVER_PORT); zk = new ZooKeeper(zkhostPort, 6000, this);
