Author: sebb
Date: Wed Nov 14 16:57:25 2007
New Revision: 595166
URL: http://svn.apache.org/viewvc?rev=595166&view=rev
Log:
Don't try restoring empty data (e.g. Java Request)
Set type to TEXT if response Data set to error message
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java?rev=595166&r1=595165&r2=595166&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
Wed Nov 14 16:57:25 2007
@@ -331,11 +331,15 @@
} else if (nodeName.equals(TAG_REQUEST_HEADER)) {
res.setRequestHeaders((String) subItem);
} else if (nodeName.equals(TAG_RESPONSE_DATA)) {
- final String dataEncoding =
res.getDataEncodingWithDefault();
- try {
- res.setResponseData(((String)
subItem).getBytes(dataEncoding));
- } catch (UnsupportedEncodingException e) {
- res.setResponseData(("Can't support the char
set: " + dataEncoding).getBytes());
+ final String responseData = (String) subItem;
+ if (responseData.length() > 0) {
+ final String dataEncoding =
res.getDataEncodingWithDefault();
+ try {
+
res.setResponseData(responseData.getBytes(dataEncoding));
+ } catch (UnsupportedEncodingException e) {
+ res.setResponseData(("Can't support the
char set: " + dataEncoding).getBytes());
+ res.setDataType(SampleResult.TEXT);
+ }
}
} else if (nodeName.equals(TAG_SAMPLER_DATA)) {
res.setSamplerData((String) subItem);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
