Return-Path: 
 <commits-return-3544-apmail-commons-commits-archive=commons.apache.org@commons.apache.org>
Delivered-To: apmail-commons-commits-archive@locus.apache.org
Received: (qmail 49728 invoked from network); 19 Jun 2008 12:10:56 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 19 Jun 2008 12:10:56 -0000
Received: (qmail 8700 invoked by uid 500); 19 Jun 2008 12:10:57 -0000
Delivered-To: apmail-commons-commits-archive@commons.apache.org
Received: (qmail 8660 invoked by uid 500); 19 Jun 2008 12:10:57 -0000
Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@commons.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@commons.apache.org>
List-Post: <mailto:commits@commons.apache.org>
List-Id: <commits.commons.apache.org>
Reply-To: dev@commons.apache.org
Delivered-To: mailing list commits@commons.apache.org
Received: (qmail 8651 invoked by uid 99); 19 Jun 2008 12:10:57 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jun 2008 05:10:57 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 19 Jun 2008 12:10:15 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 64ADA23889FD; Thu, 19 Jun 2008 05:10:34 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r669460 - in /commons/proper/net:
 branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java
 branches/NET_2_0/src/site/xdoc/changes.xml
 trunk/src/java/org/apache/commons/net/ftp/FTPClient.java
 trunk/xdocs/changes.xml
Date: Thu, 19 Jun 2008 12:10:34 -0000
To: commits@commons.apache.org
From: sebb@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080619121034.64ADA23889FD@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: sebb
Date: Thu Jun 19 05:10:33 2008
New Revision: 669460

URL: http://svn.apache.org/viewvc?rev=669460&view=rev
Log:
NET-223 - the data connection socket is not closed when an IOException occurred

Modified:
    commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java
    commons/proper/net/branches/NET_2_0/src/site/xdoc/changes.xml
    commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/FTPClient.java
    commons/proper/net/trunk/xdocs/changes.xml

Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java?rev=669460&r1=669459&r2=669460&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java Thu Jun 19 05:10:33 2008
@@ -2299,9 +2299,12 @@
         }
 
 
-        engine.readServerList(socket.getInputStream(), getControlEncoding());
-
-        socket.close();
+        try {
+            engine.readServerList(socket.getInputStream(), getControlEncoding());
+        }
+        finally {
+            socket.close();
+        }
 
         completePendingCommand();
         return engine;

Modified: commons/proper/net/branches/NET_2_0/src/site/xdoc/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/site/xdoc/changes.xml?rev=669460&r1=669459&r2=669460&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/site/xdoc/changes.xml (original)
+++ commons/proper/net/branches/NET_2_0/src/site/xdoc/changes.xml Thu Jun 19 05:10:33 2008
@@ -164,6 +164,9 @@
             <action dev="sebb" type="fix" issue="NET-208">
                 TelnetInputStream swallows interruptedexception as IOException
             </action>
+            <action dev="sebb" type="fix" issue="NET-223">
+                the data connection socket is not closed when an IOException occurred
+            </action>
 		</release>	
 
 

Modified: commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/FTPClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/FTPClient.java?rev=669460&r1=669459&r2=669460&view=diff
==============================================================================
--- commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/FTPClient.java (original)
+++ commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/FTPClient.java Thu Jun 19 05:10:33 2008
@@ -2397,9 +2397,12 @@
         }
 
 
-        engine.readServerList(socket.getInputStream(), getControlEncoding());
-
-        socket.close();
+        try {
+            engine.readServerList(socket.getInputStream(), getControlEncoding());
+        }
+        finally {
+            socket.close();
+        }
 
         completePendingCommand();
         return engine;

Modified: commons/proper/net/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/xdocs/changes.xml?rev=669460&r1=669459&r2=669460&view=diff
==============================================================================
--- commons/proper/net/trunk/xdocs/changes.xml (original)
+++ commons/proper/net/trunk/xdocs/changes.xml Thu Jun 19 05:10:33 2008
@@ -95,6 +95,9 @@
             <action dev="sebb" type="fix" issue="NET-208">
                 TelnetInputStream swallows interruptedexception as IOException
             </action>
+            <action dev="sebb" type="fix" issue="NET-223">
+                the data connection socket is not closed when an IOException occurred
+            </action>
 		</release> 
 		
 		<release version="1.4.1" date="December 3, 2005" description="fix release to restore jdk 1.3 compatability">