Author: sebb
Date: Sun Apr 6 15:24:36 2008
New Revision: 645319
URL: http://svn.apache.org/viewvc?rev=645319&view=rev
Log:
Allow for failure to open remote file
Modified:
jakarta/jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
Modified:
jakarta/jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java?rev=645319&r1=645318&r2=645319&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
Sun Apr 6 15:24:36 2008
@@ -134,7 +134,7 @@
public SampleResult sample(Entry e) {
SampleResult res = new SampleResult();
- res.setSuccessful(false);
+ res.setSuccessful(false); // Assume failure
String remote = getRemoteFilename();
String local = getLocalFilename();
boolean binaryTransfer = isBinaryMode();
@@ -195,15 +195,20 @@
target=new NullOutputStream();
}
input = ftp.retrieveFileStream(remote);
- long bytes = IOUtils.copy(input,target);
- ftpOK = bytes > 0;
- if (saveResponse){
-
res.setResponseData(baos.toByteArray());
- if (!binaryTransfer) {
-
res.setDataType(SampleResult.TEXT);
- }
+ if (input == null){// Could not access file or
other error
+
res.setResponseCode(Integer.toString(ftp.getReplyCode()));
+ res.setResponseMessage(ftp.getReplyString());
} else {
- res.setBytes((int) bytes);
+ long bytes = IOUtils.copy(input,target);
+ ftpOK = bytes > 0;
+ if (saveResponse){
+
res.setResponseData(baos.toByteArray());
+ if (!binaryTransfer) {
+
res.setDataType(SampleResult.TEXT);
+ }
+ } else {
+ res.setBytes((int) bytes);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
