avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ran...@apache.org
Subject cvs commit: jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver BaseFtpConnection.java
Date Thu, 10 Oct 2002 16:04:12 GMT
rana_b      2002/10/10 09:04:11

  Modified:    ftpserver/src/java/org/apache/avalon/ftpserver
                        BaseFtpConnection.java
  Log:
  Data connection disposed properly
  
  Revision  Changes    Path
  1.4       +6 -5      jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/BaseFtpConnection.java
  
  Index: BaseFtpConnection.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/BaseFtpConnection.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BaseFtpConnection.java	20 May 2002 10:20:17 -0000	1.3
  +++ BaseFtpConnection.java	10 Oct 2002 16:04:11 -0000	1.4
  @@ -56,15 +56,13 @@
         mUser = new FtpUser();
       }
   
  -
       /**
        * Server one FTP connection.
        */
       public void handleConnection(final Socket socket) {
  -
  -        InetAddress clientAddress = socket.getInetAddress();
  -        mConfig.getLogger().info("Handling new request from " + clientAddress.getHostAddress());
           mControlSocket = socket;
  +        InetAddress clientAddress = mControlSocket.getInetAddress();
  +        mConfig.getLogger().info("Handling new request from " + clientAddress.getHostAddress());
           mDataConnection = new FtpDataConnection(mConfig);
           mUser.setClientAddress(clientAddress);
           mConfig.getConnectionService().newConnection(this);
  @@ -165,7 +163,7 @@
       public void stop() {
           mbStopRequest = true;
           if (mDataConnection != null) {
  -            mDataConnection.reset();
  +            mDataConnection.dispose();
               mDataConnection = null;
           }
           if (mControlSocket != null) {
  @@ -286,4 +284,7 @@
       }
   
   }
  +
  +
  +
   
  
  
  

--
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