From 419ac2bf5042e2fa188f6086572cd76909d888fa Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Wed, 30 Aug 2017 07:49:34 +0200 Subject: [PATCH] FIX: Possible NPE in StringHelper (#1092) --- src/main/java/io/ebean/util/StringHelper.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/ebean/util/StringHelper.java b/src/main/java/io/ebean/util/StringHelper.java index 639aad8c6..8e4faee4c 100644 --- a/src/main/java/io/ebean/util/StringHelper.java +++ b/src/main/java/io/ebean/util/StringHelper.java @@ -430,6 +430,9 @@ public class StringHelper { * } */ public static String replaceStringMulti(String source, String[] match, String replace) { + if (source == null) { + return null; + } return replaceStringMulti(source, match, replace, 30, 0, source.length()); } @@ -443,7 +446,9 @@ public class StringHelper { */ public static String replaceStringMulti(String source, String[] match, String replace, int additionalSize, int startPos, int endPos) { - + if (source == null) { + return null; + } int shortestMatch = match[0].length(); char[] match0 = new char[match.length];