svn commit: r539541 - /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java

[pero]

Author: pero
Date: Fri May 18 11:01:34 2007
New Revision: 539541

URL: http://svn.apache.org/viewvc?view=rev&rev=539541
Log:
Remove unused local variable step 

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?view=diff&rev=539541&r1=539540&r2=539541
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Fri 
May 18 11:01:34 2007
@@ -949,7 +949,6 @@
      */
     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 @@
 
             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 @@
                                                                        
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 @@
                 }
             }
             getPoller0().register(channel);
-
         } catch (Throwable t) {
             try {
                 log.error("",t);



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]