[juneau] branch master updated: Fix NPE seen at LogParser$Entry.getText() line: 173.

[jamesbognar]

This is an automated email from the ASF dual-hosted git repository.

jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git


The following commit(s) were added to refs/heads/master by this push:
     new f6ece51  Fix NPE seen at LogParser$Entry.getText() line: 173.
     new 65f6bd4  Merge pull request #56 from 
garydgregory/npe_LogParser_Entry.getText
f6ece51 is described below

commit f6ece510a518c09785cef00dba3876dd09c62017
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Mar 5 12:31:27 2021 -0500

    Fix NPE seen at LogParser$Entry.getText() line: 173.
---
 .../main/java/org/apache/juneau/microservice/resources/LogParser.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git 
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogParser.java
 
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogParser.java
index 170917a..84916d2 100644
--- 
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogParser.java
+++ 
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogParser.java
@@ -170,6 +170,8 @@ public final class LogParser implements 
Iterable<LogParser.Entry>, Iterator<LogP
                public String getText() {
                        if (additionalText == null)
                                return text;
+                       if (text == null)
+                               return "";
                        int i = text.length();
                        for (String s : additionalText)
                                i += s.length() + 1;