You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2012/01/05 14:46:12 UTC
svn commit: r1227592 - in
/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler:
HTTPHC3Impl.java HTTPHC4Impl.java
Author: sebb
Date: Thu Jan 5 13:46:12 2012
New Revision: 1227592
URL: http://svn.apache.org/viewvc?rev=1227592&view=rev
Log:
Simplify (label already set to URL; error prefix will be added by errorResult method)
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java?rev=1227592&r1=1227591&r2=1227592&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java Thu Jan 5 13:46:12 2012
@@ -328,17 +328,14 @@ public class HTTPHC3Impl extends HTTPHCA
log.debug("End : sample");
return res;
- } catch (IllegalArgumentException e)// e.g. some kinds of invalid URL
- {
+ } catch (IllegalArgumentException e) { // e.g. some kinds of invalid URL
res.sampleEnd();
- HTTPSampleResult err = errorResult(e, res);
- err.setSampleLabel("Error: " + url.toString());
- return err;
+ errorResult(e, res);
+ return res;
} catch (IOException e) {
res.sampleEnd();
- HTTPSampleResult err = errorResult(e, res);
- err.setSampleLabel("Error: " + url.toString());
- return err;
+ errorResult(e, res);
+ return res;
} finally {
savedClient = null;
if (httpMethod != null) {
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java?rev=1227592&r1=1227591&r2=1227592&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java Thu Jan 5 13:46:12 2012
@@ -246,9 +246,8 @@ public class HTTPHC4Impl extends HTTPHCA
} catch (Exception e) {
res.sampleStart();
res.sampleEnd();
- HTTPSampleResult err = errorResult(e, res);
- err.setSampleLabel("Error: " + url.toString());
- return err;
+ errorResult(e, res);
+ return res;
}
HttpContext localContext = new BasicHttpContext();
@@ -351,14 +350,12 @@ public class HTTPHC4Impl extends HTTPHCA
} catch (IOException e) {
res.sampleEnd();
- HTTPSampleResult err = errorResult(e, res);
- err.setSampleLabel("Error: " + url.toString());
- return err;
+ errorResult(e, res);
+ return res;
} catch (RuntimeException e) {
res.sampleEnd();
- HTTPSampleResult err = errorResult(e, res);
- err.setSampleLabel("Error: " + url.toString());
- return err;
+ errorResult(e, res);
+ return res;
} finally {
currentRequest = null;
}