Author: markt
Date: Tue Nov 17 23:03:43 2009
New Revision: 881606
URL: http://svn.apache.org/viewvc?rev=881606&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48196
Reduce visibility. Patch by sebb.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
tomcat/trunk/java/org/apache/catalina/util/HexUtils.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=881606&r1=881605&r2=881606&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Tue Nov 17
23:03:43 2009
@@ -723,7 +723,7 @@
* 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",
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java?rev=881606&r1=881605&r2=881606&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
Tue Nov 17 23:03:43 2009
@@ -40,8 +40,8 @@
*/
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>();
Modified: tomcat/trunk/java/org/apache/catalina/util/HexUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/HexUtils.java?rev=881606&r1=881605&r2=881606&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/HexUtils.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/HexUtils.java Tue Nov 17
23:03:43 2009
@@ -33,7 +33,7 @@
// 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,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
