Author: kkolinko
Date: Sun Apr 27 17:05:44 2014
New Revision: 1590423
URL: http://svn.apache.org/r1590423
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56383
Merged r1590422 from tomcat/trunk:
Review of r1589994:
- Reduce visibility of fields that have getter methods
- Do not print <h3></h3> line if showServerInfo is turned off
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1590422
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1590423&r1=1590422&r2=1590423&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
Sun Apr 27 17:05:44 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() {
@@ -218,7 +218,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("<HR size=\"1\" noshade=\"noshade\">");
sb.append("<p><b>type</b> ");
@@ -270,7 +270,9 @@ public class ErrorReportValve extends Va
}
sb.append("<HR size=\"1\" noshade=\"noshade\">");
}
-
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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
