From 40acd3e77de599d274f07ea1c5dbd8771714d533 Mon Sep 17 00:00:00 2001 From: pero Date: Fri, 18 May 2007 18:01:34 +0000 Subject: [PATCH] Remove unused local variable step git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@539541 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/tomcat/util/net/NioEndpoint.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java index 3b3340b1d..dfa74a4ed 100644 --- a/java/org/apache/tomcat/util/net/NioEndpoint.java +++ b/java/org/apache/tomcat/util/net/NioEndpoint.java @@ -949,7 +949,6 @@ public class NioEndpoint { */ protected boolean setSocketOptions(SocketChannel socket) { // Process the connection - int step = 1; try { //disable blocking, APR style, we are gonna be polling it socket.configureBlocking(false); @@ -958,9 +957,7 @@ public class NioEndpoint { NioChannel channel = nioChannels.poll(); if ( channel == null ) { - // 2: SSL setup - step = 2; - + // SSL setup if (sslContext != null) { SSLEngine engine = createSSLEngine(); int appbufsize = engine.getSession().getApplicationBufferSize(); @@ -969,14 +966,14 @@ public class NioEndpoint { socketProperties.getDirectBuffer()); channel = new SecureNioChannel(socket, engine, bufhandler, selectorPool); } else { + // normal tcp setup NioBufferHandler bufhandler = new NioBufferHandler(socketProperties.getAppReadBufSize(), socketProperties.getAppWriteBufSize(), socketProperties.getDirectBuffer()); channel = new NioChannel(socket, bufhandler); } - } else { - + } else { channel.setIOChannel(socket); if ( channel instanceof SecureNioChannel ) { SSLEngine engine = createSSLEngine(); @@ -986,7 +983,6 @@ public class NioEndpoint { } } getPoller0().register(channel); - } catch (Throwable t) { try { log.error("",t); -- 2.11.0