svn commit: r1730390 - in /tomcat/trunk/java/org/apache/tomcat/util/net: Nio2Endpoint.java SocketWrapperBase.java

[markt]

Author: markt
Date: Sun Feb 14 19:28:30 2016
New Revision: 1730390

URL: http://svn.apache.org/viewvc?rev=1730390&view=rev
Log:
Remove unused code

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
    tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1730390&r1=1730389&r2=1730390&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Sun Feb 14 
19:28:30 2016
@@ -1705,7 +1705,6 @@ public class Nio2Endpoint extends Abstra
                                 }
                             }
                         } else if (state == SocketState.UPGRADING) {
-                            socket.setKeptAlive(true);
                             launch = true;
                         }
                     } else if (handshake == -1 ) {

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1730390&r1=1730389&r2=1730390&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Sun Feb 
14 19:28:30 2016
@@ -42,7 +42,6 @@ public abstract class SocketWrapperBase<
     private volatile long writeTimeout = -1;
 
     private volatile int keepAliveLeft = 100;
-    private boolean keptAlive = false;
     private volatile boolean upgraded = false;
     private boolean secure = false;
     private String negotiatedProtocol = null;
@@ -148,8 +147,6 @@ public abstract class SocketWrapperBase<
 
     public void setKeepAliveLeft(int keepAliveLeft) { this.keepAliveLeft = 
keepAliveLeft;}
     public int decrementKeepAlive() { return (--keepAliveLeft);}
-    public boolean isKeptAlive() {return keptAlive;}
-    public void setKeptAlive(boolean keptAlive) {this.keptAlive = keptAlive;}
 
     public String getRemoteHost() {
         if (remoteHost == null) {



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