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 2017/02/18 14:02:17 UTC

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

Author: pmouawad
Date: Sat Feb 18 14:02:17 2017
New Revision: 1783554

URL: http://svn.apache.org/viewvc?rev=1783554&view=rev
Log:
Fix sonar warning on stream leak

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=1783554&r1=1783553&r2=1783554&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 Sat Feb 18 14:02:17 2017
@@ -183,7 +183,6 @@ public class FTPSampler extends Abstract
             log.warn("Cannot set URL: "+e1.getLocalizedMessage());
         }
         InputStream input = null;
-        OutputStream output = null;
 
         res.sampleStart();
         FTPClient ftp = new FTPClient();
@@ -221,6 +220,7 @@ public class FTPSampler extends Abstract
                         final boolean saveResponse = isSaveResponse();
                         ByteArrayOutputStream baos=null; // No need to close this
                         OutputStream target=null; 
+                        OutputStream output = null;
                         try {
                             if (saveResponse){
                                 baos  = new ByteArrayOutputStream();
@@ -255,6 +255,7 @@ public class FTPSampler extends Abstract
                             }
                         } finally {
                             IOUtils.closeQuietly(target);
+                            IOUtils.closeQuietly(output);
                         }
                     }
 
@@ -292,7 +293,6 @@ public class FTPSampler extends Abstract
                 }
             }
             IOUtils.closeQuietly(input);
-            IOUtils.closeQuietly(output);
         }
 
         res.sampleEnd();