Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48176

Make fields final. Patch by sebb.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881600 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/tribes/io/BufferPool.java b/java/org/apache/catalina/tribes/io/BufferPool.java
index c62075d..e06e686 100644 (file)
--- a/java/org/apache/catalina/tribes/io/BufferPool.java
+++ b/java/org/apache/catalina/tribes/io/BufferPool.java
@@ -29,7 +29,7 @@ import org.apache.juli.logging.LogFactory;
 public class BufferPool {
     protected static final Log log = LogFactory.getLog(BufferPool.class);
 
-    public static int DEFAULT_POOL_SIZE = 100*1024*1024; //100MB
+    public static final int DEFAULT_POOL_SIZE = 100*1024*1024; //100MB
 
 
 

diff --git a/java/org/apache/jasper/compiler/ServletWriter.java b/java/org/apache/jasper/compiler/ServletWriter.java
index 5953586..5dedc2b 100644 (file)
--- a/java/org/apache/jasper/compiler/ServletWriter.java
+++ b/java/org/apache/jasper/compiler/ServletWriter.java
@@ -26,8 +26,8 @@ import java.io.PrintWriter;
  * @author Kin-man Chung
  */
 public class ServletWriter {
-    public static int TAB_WIDTH = 2;
-    public static String SPACES = "                              ";
+    public static final int TAB_WIDTH = 2;
+    public static final String SPACES = "                              ";
 
     // Current indent level:
     private int indent = 0;

diff --git a/modules/tomcat-lite/java/org/apache/tomcat/util/http/MimeMap.java b/modules/tomcat-lite/java/org/apache/tomcat/util/http/MimeMap.java
index 07dbe02..50a1d62 100644 (file)
--- a/modules/tomcat-lite/java/org/apache/tomcat/util/http/MimeMap.java
+++ b/modules/tomcat-lite/java/org/apache/tomcat/util/http/MimeMap.java
@@ -32,7 +32,7 @@ public class MimeMap implements FileNameMap {
     // Defaults - all of them are "well-known" types,
     // you can add using normal web.xml.
     
-    public static Hashtable<String,String> defaultMap =
+    public static final Hashtable<String,String> defaultMap =
         new Hashtable<String,String>(101);
     static {
         defaultMap.put("txt", "text/plain");