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/31 21:51:57 UTC
svn commit: r390485 -
/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
Author: sebb
Date: Fri Mar 31 11:51:54 2006
New Revision: 390485
URL: http://svn.apache.org/viewcvs?rev=390485&view=rev
Log:
Save URL
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=390485&r1=390484&r2=390485&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 Fri Mar 31 11:51:54 2006
@@ -53,6 +53,10 @@
protected static final String TAG_QUERY_STRING = "queryString"; //$NON-NLS-1$
protected static final String TAG_REDIRECT_LOCATION = "redirectLocation"; //$NON-NLS-1$
protected static final String TAG_REQUEST_HEADER = "requestHeader"; //$NON-NLS-1$
+
+ // Not needed by HTTPResultConverter
+ private static final String TAG_URL = "requestUrl"; //$NON-NLS-1$
+
protected static final String TAG_RESPONSE_DATA = "responseData"; //$NON-NLS-1$
protected static final String TAG_RESPONSE_HEADER = "responseHeader"; //$NON-NLS-1$
protected static final String TAG_SAMPLER_DATA = "samplerData"; //$NON-NLS-1$
@@ -110,6 +114,9 @@
saveRequestHeaders(writer, context, res, save);
saveResponseData(writer, context, res, save);
saveSamplerData(writer, context, res, save);
+ if (save.saveUrl()) {
+ writeString(writer, TAG_URL, res.getURL().toExternalForm());
+ }
}
/**
@@ -281,22 +288,24 @@
*/
protected boolean retrieveItem(HierarchicalStreamReader reader, UnmarshallingContext context, SampleResult res,
Object subItem) {
+ String nodeName = reader.getNodeName();
if (subItem instanceof AssertionResult) {
res.addAssertionResult((AssertionResult) subItem);
} else if (subItem instanceof SampleResult) {
res.addSubResult((SampleResult) subItem);
- } else if (reader.getNodeName().equals(TAG_RESPONSE_HEADER)) {
+ } else if (nodeName.equals(TAG_RESPONSE_HEADER)) {
res.setResponseHeaders((String) subItem);
- } else if (reader.getNodeName().equals(TAG_REQUEST_HEADER)) {
+ } else if (nodeName.equals(TAG_REQUEST_HEADER)) {
res.setRequestHeaders((String) subItem);
- } else if (reader.getNodeName().equals(TAG_RESPONSE_DATA)) {
+ } else if (nodeName.equals(TAG_RESPONSE_DATA)) {
try {
res.setResponseData(((String) subItem).getBytes(res.getDataEncoding()));
} catch (UnsupportedEncodingException e) {
res.setResponseData(("Can't support the char set: " + res.getDataEncoding()).getBytes());
}
- } else if (reader.getNodeName().equals(TAG_SAMPLER_DATA)) {
+ } else if (nodeName.equals(TAG_SAMPLER_DATA)) {
res.setSamplerData((String) subItem);
+ // Don't try restoring the URL
} else {
return false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org