You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@jmeter.apache.org by pm...@apache.org on 2012/06/05 22:25:20 UTC

svn commit: r1346572 - /jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java

Author: pmouawad
Date: Tue Jun  5 20:25:20 2012
New Revision: 1346572

URL: http://svn.apache.org/viewvc?rev=1346572&view=rev
Log:
Ensure disconnect is called even if abort fails

Modified:
    jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java

Modified: jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java?rev=1346572&r1=1346571&r2=1346572&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java (original)
+++ jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java Tue Jun  5 20:25:20 2012
@@ -299,6 +299,9 @@ public class FTPSampler extends Abstract
             savedClient = null;
             try {
                 client.abort();
+            } catch (IOException ignored) {
+            }
+            try {
                 client.disconnect();
             } catch (IOException ignored) {
             }