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

[markt]

Author: markt
Date: Tue May 13 21:12:36 2014
New Revision: 1594386

URL: http://svn.apache.org/r1594386
Log:
Consistent naming

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=1594386&r1=1594385&r2=1594386&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue May 13 
21:12:36 2014
@@ -585,13 +585,13 @@ public class Nio2Endpoint extends Abstra
         processSocket0(socketWrapper, socketStatus, dispatch);
     }
 
-    protected boolean processSocket0(SocketWrapper<Nio2Channel> socket, 
SocketStatus status, boolean dispatch) {
+    protected boolean processSocket0(SocketWrapper<Nio2Channel> socketWrapper, 
SocketStatus status, boolean dispatch) {
         try {
             SocketProcessor sc = (useCaches) ? processorCache.pop() : null;
             if (sc == null) {
-                sc = new SocketProcessor(socket, status);
+                sc = new SocketProcessor(socketWrapper, status);
             } else {
-                sc.reset(socket, status);
+                sc.reset(socketWrapper, status);
             }
             Executor executor = getExecutor();
             if (dispatch && executor != null) {
@@ -600,7 +600,7 @@ public class Nio2Endpoint extends Abstra
                 sc.run();
             }
         } catch (RejectedExecutionException ree) {
-            log.debug(sm.getString("endpoint.executor.fail", socket), ree);
+            log.debug(sm.getString("endpoint.executor.fail", socketWrapper), 
ree);
             return false;
         } catch (Throwable t) {
             ExceptionUtils.handleThrowable(t);



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