You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2006/03/29 21:16:51 UTC
svn commit: r389871 -
/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
Author: sebb
Date: Wed Mar 29 11:16:49 2006
New Revision: 389871
URL: http://svn.apache.org/viewcvs?rev=389871&view=rev
Log:
Handle null URL; use better method of detecting binary data
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java?rev=389871&r1=389870&r2=389871&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java Wed Mar 29 11:16:49 2006
@@ -18,6 +18,7 @@
package org.apache.jmeter.save.converters;
import java.io.UnsupportedEncodingException;
+import java.net.URL;
import org.apache.jmeter.assertions.AssertionResult;
import org.apache.jmeter.samplers.SampleResult;
@@ -132,13 +133,17 @@
if (save.saveResponseData(res)) {
writer.startNode(TAG_RESPONSE_DATA);
try {
- String ct = res.getContentType();
- if (ct.startsWith("text/")){// $NON-NLS-1$
+ if (SampleResult.TEXT.equals(res.getDataType())){
writer.addAttribute(ATT_CLASS, JAVA_LANG_STRING);
writer.setValue(new String(res.getResponseData(), res.getDataEncoding()));
} else {
writer.addAttribute(ATT_CLASS, JAVA_LANG_STRING);
- writer.setValue(res.getURL().toExternalForm());//TODO - better representation
+ URL url = res.getURL();
+ if (url != null) {
+ writer.setValue(url.toExternalForm());//TODO - better representation
+ } else {
+ writer.setValue("Non-text data, but URL is null");
+ }
}
} catch (UnsupportedEncodingException e) {
writer.setValue("Unsupported encoding in response data, can't record.");
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org