Repository: oodt Updated Branches: refs/heads/avro_rpc 06a8a1e1c -> bef325216
change port Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/bef32521 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/bef32521 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/bef32521 Branch: refs/heads/avro_rpc Commit: bef3252161059e3eee82ff04d3868633035190be Parents: 06a8a1e Author: Tom Barber <[email protected]> Authored: Wed Jul 6 22:18:56 2016 +0100 Committer: Tom Barber <[email protected]> Committed: Wed Jul 6 22:18:56 2016 +0100 ---------------------------------------------------------------------- .../apache/oodt/cas/workflow/system/AvroRpcWorkflowManager.java | 3 +++ .../oodt/cas/workflow/system/TestAvroRpcWorkflowManager.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/bef32521/workflow/src/main/java/org/apache/oodt/cas/workflow/system/AvroRpcWorkflowManager.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/AvroRpcWorkflowManager.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/AvroRpcWorkflowManager.java index 8cb8922..ebc2e30 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/AvroRpcWorkflowManager.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/AvroRpcWorkflowManager.java @@ -94,6 +94,9 @@ public class AvroRpcWorkflowManager implements WorkflowManager,org.apache.oodt.c engine = getWorkflowEngineFromProperty(); LOG.log(Level.INFO, "Setting workflow engine url:"+safeGetUrlFromString("http://"; + getHostname() + ":" + this.webServerPort).toString()); + if(engine == null){ + throw new NullPointerException("null engine"); + } engine.setWorkflowManagerUrl(safeGetUrlFromString("http://"; + getHostname() + ":" + this.webServerPort)); repo = getWorkflowRepositoryFromProperty(); http://git-wip-us.apache.org/repos/asf/oodt/blob/bef32521/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestAvroRpcWorkflowManager.java ---------------------------------------------------------------------- diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestAvroRpcWorkflowManager.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestAvroRpcWorkflowManager.java index d68b832..39068de 100644 --- a/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestAvroRpcWorkflowManager.java +++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestAvroRpcWorkflowManager.java @@ -34,7 +34,7 @@ import java.util.logging.Logger; public class TestAvroRpcWorkflowManager extends TestCase { - private static final int WM_PORT = 50002; + private static final int WM_PORT = 65527; private AvroRpcWorkflowManager wmgr;
