You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2014/04/27 19:03:46 UTC

svn commit: r1590422 - /tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java

Author: kkolinko
Date: Sun Apr 27 17:03:45 2014
New Revision: 1590422

URL: http://svn.apache.org/r1590422
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56383
Review of r1589994:
- Reduce visibility of fields that have getter methods
- Do not print <h3></h3> line if showServerInfo is turned off

Modified:
    tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java

Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1590422&r1=1590421&r2=1590422&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Sun Apr 27 17:03:45 2014
@@ -48,9 +48,9 @@ import org.apache.tomcat.util.res.String
  */
 public class ErrorReportValve extends ValveBase {
 
-    protected boolean showReport = true;
+    private boolean showReport = true;
 
-    protected boolean showServerInfo = true;
+    private boolean showServerInfo = true;
 
     //------------------------------------------------------ Constructor
     public ErrorReportValve() {
@@ -194,7 +194,7 @@ public class ErrorReportValve extends Va
         sb.append("</head><body>");
         sb.append("<h1>");
         sb.append(smClient.getString("errorReportValve.statusHeader",
-                               "" + statusCode, message)).append("</h1>");
+                String.valueOf(statusCode), message)).append("</h1>");
         if (showReport) {
             sb.append("<div class=\"line\"></div>");
             sb.append("<p><b>type</b> ");
@@ -246,7 +246,9 @@ public class ErrorReportValve extends Va
             }
             sb.append("<hr class=\"line\">");
         }
-        sb.append("<h3>").append(showServerInfo?ServerInfo.getServerInfo():"").append("</h3>");
+        if (showServerInfo) {
+            sb.append("<h3>").append(ServerInfo.getServerInfo()).append("</h3>");
+        }
         sb.append("</body></html>");
 
         try {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org