From 5b4010f71640baaab7b091f388dcce1ea02fcdb1 Mon Sep 17 00:00:00 2001 From: Nicolas Malin Date: Thu, 14 Nov 2019 09:16:25 +0100 Subject: [PATCH] Fixed: Possible NPE in StringUtil#strToMap (OFBIZ-11281) StringUtil#strToMap(String, String, boolean, String) throws Nullpointer for StringUtil.strToMap("", false). Thanks to Ulrich Heidfeld for this fix --- .../src/main/java/org/apache/ofbiz/base/util/StringUtil.java | 2 +- .../java/org/apache/ofbiz/base/util/test/StringUtilTests.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java index daf39a444e..717c5c9c39 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java @@ -226,7 +226,7 @@ public class StringUtil { * @return a Map of name/value pairs */ public static Map strToMap(String str, String delim, boolean trim, String pairsSeparator) { - if (str == null) { + if (UtilValidate.isEmpty(str)) { return null; } Map decodedMap = new HashMap<>(); diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java index c0f7eacfa3..26e83a8d01 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java @@ -86,6 +86,7 @@ public class StringUtilTests extends GenericTestCaseBase { public void testStrToMap() { assertNull("null-string", StringUtil.strToMap(null, false)); + assertNull("empty", StringUtil.strToMap("", false)); assertEquals("missing =", Collections.emptyMap(), StringUtil.strToMap("1", false)); assertEquals("single", map("1", "one"), StringUtil.strToMap("1=one")); assertEquals("double", map("2", "two", "1", "one"), StringUtil.strToMap("1=one|2=two"));