Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 812EEEA4E for ; Wed, 16 Jan 2013 22:12:14 +0000 (UTC) Received: (qmail 62863 invoked by uid 500); 16 Jan 2013 22:12:13 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 62782 invoked by uid 500); 16 Jan 2013 22:12:13 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 62765 invoked by uid 99); 16 Jan 2013 22:12:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Jan 2013 22:12:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Jan 2013 22:12:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 649FA23888D2 for ; Wed, 16 Jan 2013 22:11:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1434438 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Date: Wed, 16 Jan 2013 22:11:53 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130116221153.649FA23888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Wed Jan 16 22:11:53 2013 New Revision: 1434438 URL: http://svn.apache.org/viewvc?rev=1434438&view=rev Log: APR/native refactoring - Clean-up Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1434438&r1=1434437&r2=1434438&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Wed Jan 16 22:11:53 2013 @@ -1385,6 +1385,7 @@ public class AprEndpoint extends Abstrac connectionCount = 0; } + /** * Add specified socket and associated pool to the poller. The socket * will be added to a temporary array, and polled first after a maximum @@ -2142,8 +2143,8 @@ public class AprEndpoint extends Abstrac */ protected class SocketProcessor implements Runnable { - protected SocketWrapper socket = null; - protected SocketStatus status = null; + private final SocketWrapper socket; + private final SocketStatus status; public SocketProcessor(SocketWrapper socket, SocketStatus status) { @@ -2163,7 +2164,6 @@ public class AprEndpoint extends Abstrac if (state == Handler.SocketState.CLOSED) { // Close socket and pool destroySocket(socket.getSocket().longValue()); - socket = null; } else if (state == Handler.SocketState.LONG) { socket.access(); if (socket.async) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org