avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/connection Connection.java
Date Fri, 12 Jul 2002 01:25:13 GMT
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:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message