SLIDER-306 in sync w/ trunk and JDK6
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/74f2ff65 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/74f2ff65 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/74f2ff65 Branch: refs/heads/develop Commit: 74f2ff65307cf45511993f85cb8d20dc16af7f94 Parents: 3e46cb9 Author: Steve Loughran <ste...@apache.org> Authored: Tue Aug 19 11:07:03 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Fri Oct 24 21:51:10 2014 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/slider/client/SliderClient.java | 2 +- .../main/java/org/apache/slider/common/tools/SliderUtils.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/74f2ff65/slider-core/src/main/java/org/apache/slider/client/SliderClient.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java index 2805ee3..30d3b05 100644 --- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java +++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java @@ -390,7 +390,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe exitCode = actionAmSuicide(clusterName, serviceArgs.getActionAMSuicideArgs()); } else if (ACTION_LIST.equals(action)) { - exitCode = actionList(clusterName); + exitCode = actionList(clusterName, serviceArgs.getActionListArgs()); } else if (ACTION_REGISTRY.equals(action)) { exitCode = actionRegistry(serviceArgs.getActionRegistryArgs()); } else if (ACTION_RESOLVE.equals(action)) { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/74f2ff65/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java index e4d54e8..2f15a6d 100644 --- a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java +++ b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java @@ -631,8 +631,8 @@ public final class SliderUtils { if (instances.size() <= 1) { return; } - List<ApplicationReport> nonLiveInstance = new ArrayList<>(instances.size()); - List<ApplicationReport> liveInstance = new ArrayList<>(instances.size()); + List<ApplicationReport> nonLiveInstance = new ArrayList<ApplicationReport>(instances.size()); + List<ApplicationReport> liveInstance = new ArrayList<ApplicationReport>(instances.size()); for (ApplicationReport report : instances) { if (report.getYarnApplicationState() == YarnApplicationState.RUNNING
