commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
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 GMT
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">



Mime
View raw message