From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 18 Sep 2010 15:04:40 +0000 (+0000)
Subject: More refactoring. This one very simple.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=407e95573163fbbcb2664307b4a094ee13f0f550;p=tomcat7.0

More refactoring. This one very simple.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@998479 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/tomcat/util/net/JIoEndpoint.java b/java/org/apache/tomcat/util/net/JIoEndpoint.java
index 8c2bd315e..ede1de7b3 100644
--- a/java/org/apache/tomcat/util/net/JIoEndpoint.java
+++ b/java/org/apache/tomcat/util/net/JIoEndpoint.java
@@ -196,7 +196,6 @@ public class JIoEndpoint extends AbstractEndpoint {
                 try {
                     // Accept the next incoming connection from the server socket
                     Socket socket = serverSocketFactory.acceptSocket(serverSocket);
-                    serverSocketFactory.initSocket(socket);
                     // Hand this socket off to an appropriate processor
                     if (!processSocket(socket)) {
                         // Close socket right away
@@ -487,6 +486,7 @@ public class JIoEndpoint extends AbstractEndpoint {
      * Process given socket.
      */
     protected boolean processSocket(Socket socket) {
+        serverSocketFactory.initSocket(socket);
         try {
             SocketWrapper<Socket> wrapper = new SocketWrapper<Socket>(socket);
             wrapper.setKeepAliveLeft(getMaxKeepAliveRequests());