tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From violet...@apache.org
Subject svn commit: r1718523 - in /tomcat/trunk/java/org/apache: catalina/core/ catalina/manager/ catalina/mapper/ catalina/session/ catalina/ssi/ catalina/startup/ catalina/tribes/ catalina/tribes/io/ catalina/valves/ coyote/ coyote/http2/ el/util/ juli/ tomc...
Date Tue, 08 Dec 2015 07:57:34 GMT
Author: violetagg
Date: Tue Dec  8 07:57:33 2015
New Revision: 1718523

URL: http://svn.apache.org/viewvc?rev=1718523&view=rev
Log:
Classes are final but declare protected fields. Reported by Findbugs.

Modified:
    tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
    tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
    tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
    tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
    tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
    tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
    tomcat/trunk/java/org/apache/catalina/session/PersistentManager.java
    tomcat/trunk/java/org/apache/catalina/ssi/SSIFsize.java
    tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
    tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java
    tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java
    tomcat/trunk/java/org/apache/catalina/tribes/io/ReplicationStream.java
    tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
    tomcat/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java
    tomcat/trunk/java/org/apache/catalina/valves/RemoteHostValve.java
    tomcat/trunk/java/org/apache/coyote/Request.java
    tomcat/trunk/java/org/apache/coyote/Response.java
    tomcat/trunk/java/org/apache/coyote/http2/Hpack.java
    tomcat/trunk/java/org/apache/el/util/MessageFactory.java
    tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
    tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java
    tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=1718523&r1=1718522&r2=1718523&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java Tue Dec  8 07:57:33
2015
@@ -63,9 +63,9 @@ import org.apache.tomcat.util.res.String
  */
 final class ApplicationDispatcher implements AsyncDispatcher, RequestDispatcher {
 
-    protected static final boolean STRICT_SERVLET_COMPLIANCE;
+    static final boolean STRICT_SERVLET_COMPLIANCE;
 
-    protected static final boolean WRAP_SAME_OBJECT;
+    static final boolean WRAP_SAME_OBJECT;
 
 
     static {

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=1718523&r1=1718522&r2=1718523&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java Tue Dec  8 07:57:33
2015
@@ -59,7 +59,7 @@ public final class ApplicationFilterConf
 
     private static final long serialVersionUID = 1L;
 
-    protected static final StringManager sm =
+    static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
     private static final Log log = LogFactory.getLog(ApplicationFilterConfig.class);

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java?rev=1718523&r1=1718522&r2=1718523&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java Tue Dec  8 07:57:33
2015
@@ -57,9 +57,9 @@ final class StandardHostValve extends Va
     private static final ClassLoader MY_CLASSLOADER =
             StandardHostValve.class.getClassLoader();
 
-    protected static final boolean STRICT_SERVLET_COMPLIANCE;
+    static final boolean STRICT_SERVLET_COMPLIANCE;
 
-    protected static final boolean ACCESS_SESSION;
+    static final boolean ACCESS_SESSION;
 
     static {
         STRICT_SERVLET_COMPLIANCE = Globals.STRICT_SERVLET_COMPLIANCE;

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardServer.java?rev=1718523&r1=1718522&r2=1718523&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardServer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardServer.java Tue Dec  8 07:57:33 2015
@@ -147,7 +147,7 @@ public final class StandardServer extend
     /**
      * The property change support for this component.
      */
-    protected final PropertyChangeSupport support = new PropertyChangeSupport(this);
+    final PropertyChangeSupport support = new PropertyChangeSupport(this);
 
     private volatile boolean stopAwait = false;
 

Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1718523&r1=1718522&r2=1718523&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Tue Dec  8 07:57:33
2015
@@ -78,16 +78,13 @@ public final class HTMLManagerServlet ex
 
     private static final long serialVersionUID = 1L;
 
-    protected static final URLEncoder URL_ENCODER;
-    protected static final String APPLICATION_MESSAGE = "message";
-    protected static final String APPLICATION_ERROR = "error";
+    static final URLEncoder URL_ENCODER;
+    static final String APPLICATION_MESSAGE = "message";
+    static final String APPLICATION_ERROR = "error";
 
-    protected static final String sessionsListJspPath  =
-            "/WEB-INF/jsp/sessionsList.jsp";
-    protected static final String sessionDetailJspPath =
-            "/WEB-INF/jsp/sessionDetail.jsp";
-    protected static final String connectorCiphersJspPath =
-            "/WEB-INF/jsp/connectorCiphers.jsp";
+    static final String sessionsListJspPath = "/WEB-INF/jsp/sessionsList.jsp";
+    static final String sessionDetailJspPath = "/WEB-INF/jsp/sessionDetail.jsp";
+    static final String connectorCiphersJspPath = "/WEB-INF/jsp/connectorCiphers.jsp";
 
     static {
         URL_ENCODER = new URLEncoder();

Modified: tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java?rev=1718523&r1=1718522&r2=1718523&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java Tue Dec  8 07:57:33 2015
@@ -48,7 +48,7 @@ public final class Mapper {
 
     private static final Log log = LogFactory.getLog(Mapper.class);
 
-    protected static final StringManager sm = StringManager.getManager(Mapper.class);
+    static final StringManager sm = StringManager.getManager(Mapper.class);
 
     // ----------------------------------------------------- Instance Variables
 
@@ -56,20 +56,20 @@ public final class Mapper {
     /**
      * Array containing the virtual hosts definitions.
      */
-    protected volatile MappedHost[] hosts = new MappedHost[0];
+    volatile MappedHost[] hosts = new MappedHost[0];
 
 
     /**
      * Default host name.
      */
-    protected String defaultHostName = null;
+    String defaultHostName = null;
 
 
     /**
      * Mapping from Context object to Context version to support
      * RequestDispatcher mappings.
      */
-    protected Map<Context, ContextVersion> contextObjectToContextVersionMap =
+    Map<Context, ContextVersion> contextObjectToContextVersionMap =
             new ConcurrentHashMap<>();
 
 

Modified: tomcat/trunk/java/org/apache/catalina/session/PersistentManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/PersistentManager.java?rev=1718523&r1=1718522&r2=1718523&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/PersistentManager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/PersistentManager.java Tue Dec  8 07:57:33
2015
@@ -40,7 +40,7 @@ public final class PersistentManager ext
     /**
      * The descriptive name of this Manager implementation (for logging).
      */
-    protected static final String name = "PersistentManager";
+    static final String name = "PersistentManager";
 
 
     // ------------------------------------------------------------- Properties

Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIFsize.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIFsize.java?rev=1718523&r1=1718522&r2=1718523&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIFsize.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIFsize.java Tue Dec  8 07:57:33 2015
@@ -29,8 +29,8 @@ import java.text.DecimalFormat;
  * @author David Becker
  */
 public final class SSIFsize implements SSICommand {
-    protected static final int ONE_KILOBYTE = 1024;
-    protected static final int ONE_MEGABYTE = 1024 * 1024;
+    static final int ONE_KILOBYTE = 1024;
+    static final int ONE_MEGABYTE = 1024 * 1024;
 
 
     /**

Modified: tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java?rev=1718523&r1=1718522&r2=1718523&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java Tue Dec  8 07:57:33 2015
@@ -133,9 +133,9 @@ public final class Bootstrap {
     private Object catalinaDaemon = null;
 
 
-    protected ClassLoader commonLoader = null;
-    protected ClassLoader catalinaLoader = null;
-    protected ClassLoader sharedLoader = null;
+    ClassLoader commonLoader = null;
+    ClassLoader catalinaLoader = null;
+    ClassLoader sharedLoader = null;
 
 
     // -------------------------------------------------------- Private Methods

Modified: tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java?rev=1718523&r1=1718522&r2=1718523&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java Tue Dec  8 07:57:33 2015
@@ -102,12 +102,12 @@ public final class UserConfig
     /**
      * A regular expression defining user who deployment is allowed.
      */
-    protected Pattern allow = null;
+    Pattern allow = null;
 
     /**
      * A regular expression defining user who deployment is denied.
      */
-    protected Pattern deny = null;
+    Pattern deny = null;
 
     // ------------------------------------------------------------- Properties
 

Modified: tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java?rev=1718523&r1=1718522&r2=1718523&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java Tue Dec  8 07:57:33 2015
@@ -30,7 +30,7 @@ import org.apache.catalina.tribes.util.A
 public final class UniqueId implements Serializable{
     private static final long serialVersionUID = 1L;
 
-    protected final byte[] id;
+    final byte[] id;
 
     public UniqueId() {
         this(null);

Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/ReplicationStream.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/ReplicationStream.java?rev=1718523&r1=1718522&r2=1718523&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/ReplicationStream.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/ReplicationStream.java Tue Dec  8 07:57:33
2015
@@ -37,7 +37,7 @@ import org.apache.catalina.tribes.util.S
  */
 public final class ReplicationStream extends ObjectInputStream {
 
-    protected static final StringManager sm = StringManager.getManager(ReplicationStream.class);
+    static final StringManager sm = StringManager.getManager(ReplicationStream.class);
 
     /**
      * The class loader we will use to resolve classes.

Modified: tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java?rev=1718523&r1=1718522&r2=1718523&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java Tue Dec  8 07:57:33
2015
@@ -165,23 +165,23 @@ public final class JDBCAccessLogValve ex
     * Use long contentLength as you have more 4 GB output.
     * @since 6.0.15
     */
-    protected boolean useLongContentLength = false ;
+    boolean useLongContentLength = false ;
 
    /**
      * The connection username to use when trying to connect to the database.
      */
-    protected String connectionName = null;
+    String connectionName = null;
 
 
     /**
      * The connection URL to use when trying to connect to the database.
      */
-    protected String connectionPassword = null;
+    String connectionPassword = null;
 
    /**
      * Instance of the JDBC Driver class we use as a connection factory.
      */
-    protected Driver driver = null;
+    Driver driver = null;
 
 
     private String driverName;
@@ -210,7 +210,7 @@ public final class JDBCAccessLogValve ex
     /**
      * @see #setRequestAttributesEnabled(boolean)
      */
-    protected boolean requestAttributesEnabled = true;
+    boolean requestAttributesEnabled = true;
 
 
     // ------------------------------------------------------------- Properties

Modified: tomcat/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java?rev=1718523&r1=1718522&r2=1718523&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java Tue Dec  8 07:57:33
2015
@@ -41,7 +41,7 @@ public final class RemoteAddrValve exten
      * compared in the filtering method. The port will be appended
      * using a ";" as a separator.
      */
-    protected volatile boolean addConnectorPort = false;
+    volatile boolean addConnectorPort = false;
 
     // ------------------------------------------------------------- Properties
 

Modified: tomcat/trunk/java/org/apache/catalina/valves/RemoteHostValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteHostValve.java?rev=1718523&r1=1718522&r2=1718523&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/RemoteHostValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/RemoteHostValve.java Tue Dec  8 07:57:33
2015
@@ -41,7 +41,7 @@ public final class RemoteHostValve exten
      * compared in the filtering method. The port will be appended
      * using a ";" as a separator.
      */
-    protected volatile boolean addConnectorPort = false;
+    volatile boolean addConnectorPort = false;
 
     // ------------------------------------------------------------- Properties
 

Modified: tomcat/trunk/java/org/apache/coyote/Request.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Request.java?rev=1718523&r1=1718522&r2=1718523&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/Request.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Request.java Tue Dec  8 07:57:33 2015
@@ -152,7 +152,7 @@ public final class Request {
 
     private boolean sendfile = true;
 
-    protected volatile ReadListener listener;
+    volatile ReadListener listener;
 
     public ReadListener getReadListener() {
         return listener;

Modified: tomcat/trunk/java/org/apache/coyote/Response.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Response.java?rev=1718523&r1=1718522&r2=1718523&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/Response.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Response.java Tue Dec  8 07:57:33 2015
@@ -57,52 +57,52 @@ public final class Response {
     /**
      * Status code.
      */
-    protected int status = 200;
+    int status = 200;
 
 
     /**
      * Status message.
      */
-    protected String message = null;
+    String message = null;
 
 
     /**
      * Response headers.
      */
-    protected final MimeHeaders headers = new MimeHeaders();
+    final MimeHeaders headers = new MimeHeaders();
 
 
     /**
      * Associated output buffer.
      */
-    protected OutputBuffer outputBuffer;
+    OutputBuffer outputBuffer;
 
 
     /**
      * Notes.
      */
-    protected final Object notes[] = new Object[Constants.MAX_NOTES];
+    final Object notes[] = new Object[Constants.MAX_NOTES];
 
 
     /**
      * Committed flag.
      */
-    protected volatile boolean commited = false;
+    volatile boolean commited = false;
 
 
     /**
      * Action hook.
      */
-    protected volatile ActionHook hook;
+    volatile ActionHook hook;
 
 
     /**
      * HTTP specific fields.
      */
-    protected String contentType = null;
-    protected String contentLanguage = null;
-    protected String characterEncoding = Constants.DEFAULT_CHARACTER_ENCODING;
-    protected long contentLength = -1;
+    String contentType = null;
+    String contentLanguage = null;
+    String characterEncoding = Constants.DEFAULT_CHARACTER_ENCODING;
+    long contentLength = -1;
     private Locale locale = DEFAULT_LOCALE;
 
     // General informations
@@ -112,14 +112,14 @@ public final class Response {
     /**
      * Holds request error exception.
      */
-    protected Exception errorException = null;
+    Exception errorException = null;
 
     /**
      * Has the charset been explicitly set.
      */
-    protected boolean charsetSet = false;
+    boolean charsetSet = false;
 
-    protected Request req;
+    Request req;
 
     // ------------------------------------------------------------- Properties
 
@@ -570,7 +570,7 @@ public final class Response {
      * easily reachable from the CoyoteOutputStream and the Processor which both
      * need access to state.
      */
-    protected volatile WriteListener listener;
+    volatile WriteListener listener;
     private boolean fireListener = false;
     private boolean registeredForWrite = false;
     private final Object nonBlockingStateLock = new Object();

Modified: tomcat/trunk/java/org/apache/coyote/http2/Hpack.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Hpack.java?rev=1718523&r1=1718522&r2=1718523&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Hpack.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Hpack.java Tue Dec  8 07:57:33 2015
@@ -22,7 +22,7 @@ import org.apache.tomcat.util.res.String
 
 final class Hpack {
 
-    protected static final StringManager sm = StringManager.getManager(Hpack.class);
+    static final StringManager sm = StringManager.getManager(Hpack.class);
 
     private static final byte LOWER_DIFF = 'a' - 'A';
     static final int DEFAULT_TABLE_SIZE = 4096;

Modified: tomcat/trunk/java/org/apache/el/util/MessageFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/util/MessageFactory.java?rev=1718523&r1=1718522&r2=1718523&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/util/MessageFactory.java (original)
+++ tomcat/trunk/java/org/apache/el/util/MessageFactory.java Tue Dec  8 07:57:33 2015
@@ -24,7 +24,7 @@ import java.util.ResourceBundle;
  */
 public final class MessageFactory {
 
-    protected static final ResourceBundle bundle =
+    static final ResourceBundle bundle =
             ResourceBundle.getBundle("org.apache.el.Messages");
 
     public MessageFactory() {

Modified: tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=1718523&r1=1718522&r2=1718523&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java (original)
+++ tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Tue Dec  8 07:57:33 2015
@@ -663,9 +663,9 @@ public class ClassLoaderLogManager exten
     protected static final class LogNode {
         Logger logger;
 
-        protected final Map<String, LogNode> children = new HashMap<>();
+        final Map<String, LogNode> children = new HashMap<>();
 
-        protected final LogNode parent;
+        final LogNode parent;
 
         LogNode(final LogNode parent, final Logger logger) {
             this.parent = parent;

Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java?rev=1718523&r1=1718522&r2=1718523&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java Tue Dec  8 07:57:33
2015
@@ -703,7 +703,7 @@ public class WebRuleSet extends RuleSetB
  * only 1 time within the web.xml
  */
 final class SetLoginConfig extends Rule {
-    protected boolean isLoginConfigSet = false;
+    boolean isLoginConfigSet = false;
     public SetLoginConfig() {
         // NO-OP
     }
@@ -726,7 +726,7 @@ final class SetLoginConfig extends Rule
  * only 1 time within the web.xml
  */
 final class SetJspConfig extends Rule {
-    protected boolean isJspConfigSet = false;
+    boolean isJspConfigSet = false;
     public SetJspConfig() {
         // NO-OP
     }
@@ -749,7 +749,7 @@ final class SetJspConfig extends Rule {
  * only 1 time within the web.xml
  */
 final class SetSessionConfig extends Rule {
-    protected boolean isSessionConfigSet = false;
+    boolean isSessionConfigSet = false;
     public SetSessionConfig() {
         // NO-OP
     }
@@ -946,7 +946,7 @@ final class CallParamMultiRule extends C
  */
 final class CallMethodMultiRule extends CallMethodRule {
 
-    protected final int multiParamIndex;
+    final int multiParamIndex;
 
     public CallMethodMultiRule(String methodName, int paramCount, int multiParamIndex) {
         super(methodName, paramCount);
@@ -1103,7 +1103,7 @@ final class VersionRule extends Rule {
  */
 final class NameRule extends Rule {
 
-    protected boolean isNameSet = false;
+    boolean isNameSet = false;
 
     public NameRule() {
         // NO-OP
@@ -1134,7 +1134,7 @@ final class NameRule extends Rule {
  */
 final class AbsoluteOrderingRule extends Rule {
 
-    protected boolean isAbsoluteOrderingSet = false;
+    boolean isAbsoluteOrderingSet = false;
     private final boolean fragment;
 
     public AbsoluteOrderingRule(boolean fragment) {
@@ -1168,7 +1168,7 @@ final class AbsoluteOrderingRule extends
  */
 final class RelativeOrderingRule extends Rule {
 
-    protected boolean isRelativeOrderingSet = false;
+    boolean isRelativeOrderingSet = false;
     private final boolean fragment;
 
     public RelativeOrderingRule(boolean fragment) {

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java?rev=1718523&r1=1718522&r2=1718523&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java Tue Dec  8 07:57:33
2015
@@ -111,7 +111,7 @@ public final class OpenSSLEngine extends
     private static final int MAX_CIPHERTEXT_LENGTH = MAX_COMPRESSED_LENGTH + 1024;
 
     // Protocols
-    protected static final int VERIFY_DEPTH = 10;
+    static final int VERIFY_DEPTH = 10;
 
     private static final String[] SUPPORTED_PROTOCOLS = {
         Constants.SSL_PROTO_SSLv2Hello,



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


Mime
View raw message