Repository: hadoop
Updated Branches:
refs/heads/branch-3.1 3d77094cf -> 610b00bdf
HADOOP-15755. StringUtils#createStartupShutdownMessage throws NPE when args is
null. Contributed by Lokesh Jain and Dinesh Chitlangia
(cherry picked from commit e71f61ecb87e04727a5a76e578a75714c9db6706)
Conflicts:
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/610b00bd
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/610b00bd
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/610b00bd
Branch: refs/heads/branch-3.1
Commit: 610b00bdf40cbfa3bb18975ad1334f8fb790a1d4
Parents: 3d77094
Author: Jason Lowe <[email protected]>
Authored: Tue Sep 18 15:55:09 2018 -0500
Committer: Jason Lowe <[email protected]>
Committed: Tue Sep 18 16:00:48 2018 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/util/StringUtils.java | 2 +-
.../test/java/org/apache/hadoop/util/TestStringUtils.java | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/610b00bd/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java
----------------------------------------------------------------------
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java
index ebe7013..b29d8c2 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java
@@ -743,7 +743,7 @@ public class StringUtils {
return toStartupShutdownString("STARTUP_MSG: ", new String[] {
"Starting " + classname,
" host = " + hostname,
- " args = " + Arrays.asList(args),
+ " args = " + (args != null ? Arrays.asList(args) : new ArrayList<>()),
" version = " + VersionInfo.getVersion(),
" classpath = " + System.getProperty("java.class.path"),
" build = " + VersionInfo.getUrl() + " -r "
http://git-wip-us.apache.org/repos/asf/hadoop/blob/610b00bd/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java
----------------------------------------------------------------------
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java
index 1f474f8..6b9a7d4 100644
---
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java
@@ -476,6 +476,15 @@ public class TestStringUtils extends UnitTestcaseTimeLimit
{
executorService.awaitTermination(50, TimeUnit.SECONDS);
}
+ @Test
+ public void testCreateStartupShutdownMessage() {
+ //pass null args and method must still return a string beginning with
+ // "STARTUP_MSG"
+ String msg = StringUtils.createStartupShutdownMessage(
+ this.getClass().getName(), "test.host", null);
+ assertTrue(msg.startsWith("STARTUP_MSG:"));
+ }
+
// Benchmark for StringUtils split
public static void main(String []args) {
final String TO_SPLIT = "foo,bar,baz,blah,blah";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
