svn commit: r1661525 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java

[markt]

Author: markt
Date: Sun Feb 22 18:50:15 2015
New Revision: 1661525

URL: http://svn.apache.org/r1661525
Log:
Remove upgradeInit code as the code that called it has been removed

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.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=1661525&r1=1661524&r2=1661525&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 22 
18:50:15 2015
@@ -732,7 +732,6 @@ public class Nio2Endpoint extends Abstra
         };
 
         private SendfileData sendfileData = null;
-        private boolean upgradeInit = false;
 
         private final CompletionHandler<Integer, 
SocketWrapperBase<Nio2Channel>> readCompletionHandler;
         private final Semaphore readPending = new Semaphore(1);
@@ -938,7 +937,6 @@ public class Nio2Endpoint extends Abstra
                         new Exception());
             }
             super.reset(channel, soTimeout);
-            upgradeInit = false;
             sendfileData = null;
         }
 
@@ -952,19 +950,6 @@ public class Nio2Endpoint extends Abstra
             }
         }
 
-        @Override
-        public void setUpgraded(boolean upgraded) {
-            if (upgraded && !isUpgraded()) {
-                upgradeInit = true;
-            }
-            super.setUpgraded(upgraded);
-        }
-
-        public boolean isUpgradeInit() {
-            boolean value = upgradeInit;
-            upgradeInit = false;
-            return value;
-        }
 
         public void setSendfileData(SendfileData sf) { this.sendfileData = sf; 
}
         public SendfileData getSendfileData() { return this.sendfileData; }



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