You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/06/26 15:16:45 UTC

[tomcat] 02/02: Remove unused code

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 7977440111f96ccbfea039b913fd1744ea5867cb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jun 26 16:16:26 2020 +0100

    Remove unused code
---
 .../apache/tomcat/util/net/SocketWrapperBase.java  | 30 ----------------------
 1 file changed, 30 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
index 0e5fb85..ad7d1e3 100644
--- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
+++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
@@ -52,8 +52,6 @@ public abstract class SocketWrapperBase<E> {
     private volatile long writeTimeout = -1;
 
     private volatile int keepAliveLeft = 100;
-    private volatile boolean upgraded = false;
-    private boolean secure = false;
     private String negotiatedProtocol = null;
 
     /*
@@ -171,34 +169,6 @@ public abstract class SocketWrapperBase<E> {
         }
     }
 
-    /**
-     * @return {@code true} if the connection has been upgraded.
-     *
-     * @deprecated Unused. Will be removed in Tomcat 10.
-     */
-    @Deprecated
-    public boolean isUpgraded() { return upgraded; }
-    /**
-     * @param upgraded {@code true} if the connection has been upgraded.
-     *
-     * @deprecated Unused. Will be removed in Tomcat 10.
-     */
-    @Deprecated
-    public void setUpgraded(boolean upgraded) { this.upgraded = upgraded; }
-    /**
-     * @return {@code true} if the connection uses TLS
-     *
-     * @deprecated Unused. Will be removed in Tomcat 10.
-     */
-    @Deprecated
-    public boolean isSecure() { return secure; }
-    /**
-     * @param secure {@code true} if the connection uses TLS
-     *
-     * @deprecated Unused. Will be removed in Tomcat 10.
-     */
-    @Deprecated
-    public void setSecure(boolean secure) { this.secure = secure; }
     public String getNegotiatedProtocol() { return negotiatedProtocol; }
     public void setNegotiatedProtocol(String negotiatedProtocol) {
         this.negotiatedProtocol = negotiatedProtocol;


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