Author: zjshen Date: Thu Jun 12 06:48:49 2014 New Revision: 1602073 URL: http://svn.apache.org/r1602073 Log: YARN-2075. Fixed the test failure of TestRMAdminCLI. Contributed by Kenji Kikushima. svn merge --ignore-ancestry -c 1602071 ../../trunk/
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java?rev=1602073&r1=1602072&r2=1602073&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java Thu Jun 12 06:48:49 2014 @@ -19,6 +19,7 @@ package org.apache.hadoop.ha; import java.io.IOException; import java.io.PrintStream; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Map; @@ -68,7 +69,7 @@ public abstract class HAAdmin extends Co protected final static Map<String, UsageInfo> USAGE = ImmutableMap.<String, UsageInfo>builder() .put("-transitionToActive", - new UsageInfo(" <serviceId> [--"+FORCEACTIVE+"]", "Transitions the service into Active state")) + new UsageInfo("<serviceId> [--"+FORCEACTIVE+"]", "Transitions the service into Active state")) .put("-transitionToStandby", new UsageInfo("<serviceId>", "Transitions the service into Standby state")) .put("-failover", @@ -104,7 +105,8 @@ public abstract class HAAdmin extends Co protected abstract HAServiceTarget resolveTarget(String string); protected Collection<String> getTargetIds(String targetNodeToActivate) { - return Arrays.asList(new String[]{targetNodeToActivate}); + return new ArrayList<String>( + Arrays.asList(new String[]{targetNodeToActivate})); } protected String getUsageString() {