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

Reduce visibility. Patch by sebb.

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

diff --git a/java/org/apache/catalina/startup/Tomcat.java b/java/org/apache/catalina/startup/Tomcat.java
index e08ac0f..9c2f3f0 100644 (file)
--- a/java/org/apache/catalina/startup/Tomcat.java
+++ b/java/org/apache/catalina/startup/Tomcat.java
@@ -723,7 +723,7 @@ public class Tomcat {
      * This is needed because we don't use the default web.xml, where this 
      * is encoded.
      */
-    public static final String[] DEFAULT_MIME_MAPPINGS = {
+    private static final String[] DEFAULT_MIME_MAPPINGS = {
         "abs", "audio/x-mpeg", 
         "ai", "application/postscript", 
         "aif", "audio/x-aiff", 

diff --git a/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java b/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
index 5f8476f..1eb5054 100644 (file)
--- a/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
@@ -40,8 +40,8 @@ import java.util.Map;
  */
 public class TwoPhaseCommitInterceptor extends ChannelInterceptorBase {
 
-    public static final byte[] START_DATA = new byte[] {113, 1, -58, 2, -34, -60, 75, -78, -101, -12, 32, -29, 32, 111, -40, 4};
-    public static final byte[] END_DATA = new byte[] {54, -13, 90, 110, 47, -31, 75, -24, -81, -29, 36, 52, -58, 77, -110, 56};
+    private static final byte[] START_DATA = new byte[] {113, 1, -58, 2, -34, -60, 75, -78, -101, -12, 32, -29, 32, 111, -40, 4};
+    private static final byte[] END_DATA = new byte[] {54, -13, 90, 110, 47, -31, 75, -24, -81, -29, 36, 52, -58, 77, -110, 56};
     private static final org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(TwoPhaseCommitInterceptor.class);
 
     protected HashMap<UniqueId, MapEntry> messages = new HashMap<UniqueId, MapEntry>();

diff --git a/java/org/apache/catalina/util/HexUtils.java b/java/org/apache/catalina/util/HexUtils.java
index 8d119a1..9ad664c 100644 (file)
--- a/java/org/apache/catalina/util/HexUtils.java
+++ b/java/org/apache/catalina/util/HexUtils.java
@@ -33,7 +33,7 @@ public final class HexUtils {
     // Code from Ajp11, from Apache's JServ
 
     // Table for HEX to DEC byte translation
-    public static final int[] DEC = {
+    private static final int[] DEC = {
         -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
         -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
         -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,