You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by hu...@apache.org on 2018/08/22 01:17:48 UTC
[incubator-heron] branch master updated: fixunit (#3001)
This is an automated email from the ASF dual-hosted git repository.
huijun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/master by this push:
new 28c3900 fixunit (#3001)
28c3900 is described below
commit 28c3900f1a3fa1bdbf6ba812d0d3257e96940395
Author: bed debug <hu...@users.noreply.github.com>
AuthorDate: Tue Aug 21 18:17:45 2018 -0700
fixunit (#3001)
---
.../tests/java/org/apache/heron/scheduler/RuntimeManagerRunnerTest.java | 2 +-
.../src/java/org/apache/heron/apiserver/resources/TopologyResource.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/heron/scheduler-core/tests/java/org/apache/heron/scheduler/RuntimeManagerRunnerTest.java b/heron/scheduler-core/tests/java/org/apache/heron/scheduler/RuntimeManagerRunnerTest.java
index bcd8b4d..88a3a2c 100644
--- a/heron/scheduler-core/tests/java/org/apache/heron/scheduler/RuntimeManagerRunnerTest.java
+++ b/heron/scheduler-core/tests/java/org/apache/heron/scheduler/RuntimeManagerRunnerTest.java
@@ -236,7 +236,7 @@ public class RuntimeManagerRunnerTest {
when(manager.getPackingPlan(eq(TOPOLOGY_NAME))).thenReturn(currentPlan);
doReturn(proposedPlan).when(runner).buildNewPackingPlan(
- eq(currentPlan), eq(changeRequests), null, any(TopologyAPI.Topology.class));
+ eq(currentPlan), eq(changeRequests), any(), any(TopologyAPI.Topology.class));
Scheduler.UpdateTopologyRequest updateTopologyRequest =
Scheduler.UpdateTopologyRequest.newBuilder()
diff --git a/heron/tools/apiserver/src/java/org/apache/heron/apiserver/resources/TopologyResource.java b/heron/tools/apiserver/src/java/org/apache/heron/apiserver/resources/TopologyResource.java
index 7f769e3..b743aac 100644
--- a/heron/tools/apiserver/src/java/org/apache/heron/apiserver/resources/TopologyResource.java
+++ b/heron/tools/apiserver/src/java/org/apache/heron/apiserver/resources/TopologyResource.java
@@ -357,7 +357,7 @@ public class TopologyResource extends HeronResource {
List<String> components = params.get(PARAM_COMPONENT_PARALLELISM);
List<String> runtimeConfigs = params.get(PARAM_RUNTIME_CONFIG_KEY);
List<String> containersList = params.get(PARAM_CONTAINER_NUMBER);
- if (containersList.size() > 1) {
+ if (containersList != null && containersList.size() > 1) {
Utils.createMessage("only one value should be specified for container_number. "
+ "picking first value.");
}