Return-Path: Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org Received: (qmail 82804 invoked from network); 12 Jul 2002 01:25:26 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 12 Jul 2002 01:25:26 -0000 Received: (qmail 16548 invoked by uid 97); 12 Jul 2002 01:25:47 -0000 Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org Received: (qmail 16532 invoked by uid 97); 12 Jul 2002 01:25:47 -0000 Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Avalon CVS List" Reply-To: "Avalon Developers List" Delivered-To: mailing list avalon-cvs@jakarta.apache.org Received: (qmail 16520 invoked by uid 97); 12 Jul 2002 01:25:46 -0000 X-Antivirus: nagoya (v4198 created Apr 24 2002) Date: 12 Jul 2002 01:25:13 -0000 Message-ID: <20020712012513.21660.qmail@icarus.apache.org> From: donaldp@apache.org To: jakarta-avalon-cornerstone-cvs@apache.org Subject: cvs commit: jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/connection Connection.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N donaldp 2002/07/11 18:25:13 Modified: src/java/org/apache/avalon/cornerstone/blocks/connection Connection.java Log: Simplify by removing finally section Revision Changes Path 1.16 +11 -12 jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/connection/Connection.java Index: Connection.java =================================================================== RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/connection/Connection.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Connection.java 12 Jul 2002 01:24:09 -0000 1.15 +++ Connection.java 12 Jul 2002 01:25:12 -0000 1.16 @@ -175,23 +175,22 @@ final String message = "Error handling connection"; getLogger().warn( message, e ); } - finally + + if( null != handler ) { - if( null != handler ) - { - m_handlerFactory.releaseConnectionHandler( handler ); - } + m_handlerFactory.releaseConnectionHandler( handler ); + } - shutdownSocket(); + shutdownSocket(); - synchronized( this ) - { - m_thread = null; - m_runners.remove( this ); + synchronized( this ) + { + m_thread = null; + m_runners.remove( this ); - notifyAll(); - } + notifyAll(); } + } /** -- To unsubscribe, e-mail: For additional commands, e-mail: