This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 6b02273 Fix possible NPE. Correct ExceptionUtils import.
6b02273 is described below
commit 6b022733e12d0cffef413d880a238ba5ef0ddd6b
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Oct 15 10:01:57 2020 +0100
Fix possible NPE. Correct ExceptionUtils import.
---
java/org/apache/catalina/valves/JsonErrorReportValve.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/valves/JsonErrorReportValve.java
b/java/org/apache/catalina/valves/JsonErrorReportValve.java
index a438e77..5233bff 100644
--- a/java/org/apache/catalina/valves/JsonErrorReportValve.java
+++ b/java/org/apache/catalina/valves/JsonErrorReportValve.java
@@ -22,8 +22,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
-import org.apache.catalina.tribes.util.ExceptionUtils;
import org.apache.coyote.ActionCode;
+import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -75,7 +75,7 @@ public class JsonErrorReportValve extends ErrorReportValve {
String description = null;
description = smClient.getString("http." + statusCode + ".desc");
if (description == null) {
- if (message.isEmpty()) {
+ if (message == null || message.isEmpty()) {
return;
} else {
description =
smClient.getString("errorReportValve.noDescription");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
