midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-2303 NPE on MailText.parse

This commit is contained in:
Nicolas Micoud 2014-11-05 08:49:05 -05:00
parent 6ad4577e1d
commit 5bbeae195b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.adempiere.base/src/org/compiere/model/MMailText.java
View File

@ -157,7 +157,7 @@ public class MMailText extends X_R_MailText
*/ */
private String parse (String text) private String parse (String text)
{ {
if (text.indexOf('@') == -1) if (Util.isEmpty(text) || text.indexOf('@') == -1)
return text; return text;
// Parse User // Parse User
text = parse (text, m_user); text = parse (text, m_user);
@ -177,7 +177,7 @@ public class MMailText extends X_R_MailText
*/ */
private String parse (String text, PO po) private String parse (String text, PO po)
{ {
if (po == null || text.indexOf('@') == -1) if (po == null || Util.isEmpty(text) || text.indexOf('@') == -1)
return text; return text;
String inStr = text; String inStr = text;