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/04/01 01:04:55 UTC
svn commit: r390535 - in /jakarta/jmeter/branches/rel-2-1/src:
components/org/apache/jmeter/assertions/
components/org/apache/jmeter/extractor/ core/org/apache/jmeter/samplers/
core/org/apache/jmeter/visualizers/ functions/org/apache/jmeter/functions/
Author: sebb
Date: Fri Mar 31 15:04:52 2006
New Revision: 390535
URL: http://svn.apache.org/viewcvs?rev=390535&view=rev
Log:
ResponseData can never be null; use length instead
Modified:
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/SizeAssertion.java
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/XMLAssertion.java
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/XPathAssertion.java
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/RegexExtractor.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java
Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/HTMLAssertion.java?rev=390535&r1=390534&r2=390535&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/HTMLAssertion.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/HTMLAssertion.java Fri Mar 31 15:04:52 2006
@@ -79,7 +79,7 @@
// no error as default
AssertionResult result = new AssertionResult();
- if (inResponse.getResponseData() == null) {
+ if (inResponse.getResponseData().length == 0) {
return result.setResultForNull();
}
Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java?rev=390535&r1=390534&r2=390535&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java Fri Mar 31 15:04:52 2006
@@ -54,7 +54,7 @@
result.setFailure(false);
byte[] resultData = response.getResponseData();
- if (resultData == null) {
+ if (resultData.length == 0) {
result.setError(false);
result.setFailure(true);
result.setFailureMessage("Response was null");
Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/SizeAssertion.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/SizeAssertion.java?rev=390535&r1=390534&r2=390535&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/SizeAssertion.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/SizeAssertion.java Fri Mar 31 15:04:52 2006
@@ -66,12 +66,12 @@
public AssertionResult getResult(SampleResult response) {
AssertionResult result = new AssertionResult();
result.setFailure(false);
- if (response.getResponseData() == null) {
+ resultData = response.getResponseData();
+ long resultSize = resultData.length;
+ if (resultSize==0) {
return result.setResultForNull();
}
// is the Sample the correct size?
- resultData = response.getResponseData();
- long resultSize = resultData.length;
if ((!(compareSize(resultSize)) && (getAllowedSize() > 0))) {
result.setFailure(true);
Object[] arguments = { new Long(resultSize), comparatorErrorMessage, new Long(getAllowedSize()) };
Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/XMLAssertion.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/XMLAssertion.java?rev=390535&r1=390534&r2=390535&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/XMLAssertion.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/XMLAssertion.java Fri Mar 31 15:04:52 2006
@@ -53,13 +53,14 @@
public AssertionResult getResult(SampleResult response) {
// no error as default
AssertionResult result = new AssertionResult();
- if (response.getResponseData() == null) {
+ byte[] responseData = response.getResponseData();
+ if (responseData.length == 0) {
return result.setResultForNull();
}
result.setFailure(false);
// the result data
- String resultData = new String(getResultBody(response.getResponseData()));
+ String resultData = new String(getResultBody(responseData));
SAXBuilder builder = (SAXBuilder) myBuilder.get();
Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java?rev=390535&r1=390534&r2=390535&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java Fri Mar 31 15:04:52 2006
@@ -66,7 +66,7 @@
// Note: initialised with error = failure = false
byte data[] = response.getResponseData();
- if (data == null || data.length == 0) {
+ if (data.length == 0) {
return result.setResultForNull();
}
String resultData = new String(getResultBody(data));
Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/XPathAssertion.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/XPathAssertion.java?rev=390535&r1=390534&r2=390535&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/XPathAssertion.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/XPathAssertion.java Fri Mar 31 15:04:52 2006
@@ -69,7 +69,8 @@
public AssertionResult getResult(SampleResult response) {
// no error as default
AssertionResult result = new AssertionResult();
- if (response.getResponseData() == null) {
+ byte[] responseData = response.getResponseData();
+ if (responseData.length == 0) {
return result.setResultForNull();
}
result.setFailure(false);
@@ -84,7 +85,7 @@
Document doc = null;
try {
- doc = XPathUtil.makeDocument(new ByteArrayInputStream(response.getResponseData()), isValidating(),
+ doc = XPathUtil.makeDocument(new ByteArrayInputStream(responseData), isValidating(),
isWhitespace(), isNamespace(), isTolerant());
} catch (SAXException e) {
log.debug("Caught sax exception: " + e);
Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java?rev=390535&r1=390534&r2=390535&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java Fri Mar 31 15:04:52 2006
@@ -53,7 +53,7 @@
JMeterContext jmctx = JMeterContextService.getContext();
SampleResult prev = jmctx.getPreviousResult();
- if (prev == null || prev.getResponseData() == null) {
+ if (prev == null || prev.getResponseData().length == 0) {
return;
}
Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/RegexExtractor.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/RegexExtractor.java?rev=390535&r1=390534&r2=390535&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/RegexExtractor.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/RegexExtractor.java Fri Mar 31 15:04:52 2006
@@ -24,6 +24,7 @@
import java.util.List;
import org.apache.jmeter.processor.PostProcessor;
+import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testelement.AbstractTestElement;
import org.apache.jmeter.testelement.property.IntegerProperty;
import org.apache.jmeter.threads.JMeterContext;
@@ -86,7 +87,8 @@
public void process() {
initTemplate();
JMeterContext context = getThreadContext();
- if (context.getPreviousResult() == null || context.getPreviousResult().getResponseData() == null) {
+ SampleResult previousResult = context.getPreviousResult();
+ if (previousResult == null || previousResult.getResponseData().length == 0) {
return;
}
log.debug("RegexExtractor processing result");
@@ -104,8 +106,8 @@
Perl5Matcher matcher = (Perl5Matcher) localMatcher.get();
PatternMatcherInput input = new PatternMatcherInput(
useHeaders()
- ? context.getPreviousResult().getResponseHeaders()
- : context.getPreviousResult().getResponseDataAsString()); // Bug 36898
+ ? previousResult.getResponseHeaders()
+ : previousResult.getResponseDataAsString()); // Bug 36898
log.debug("Regex = " + getRegex());
try {
Pattern pattern = patternCache.getPattern(getRegex(), Perl5Compiler.READ_ONLY_MASK);
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java?rev=390535&r1=390534&r2=390535&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java Fri Mar 31 15:04:52 2006
@@ -44,16 +44,7 @@
// Add Sample Counter
setSampleCount(getSampleCount() + res.getSampleCount());
- // Add bytes
- int bytesLength = 0;
- // in case the sampler doesn't return the contents
- // we see if the bytes was set
- if (res.getResponseData() == null || res.getResponseData().length == 0) {
- bytesLength = res.getBytes();
- } else {
- bytesLength = res.getResponseData().length;
- }
- setBytes(getBytes() + bytesLength);
+ setBytes(getBytes() + res.getBytes());
// Add Error Counter
if (!res.isSuccessful()) {
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java?rev=390535&r1=390534&r2=390535&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java Fri Mar 31 15:04:52 2006
@@ -217,14 +217,7 @@
double throughput;
boolean rbool;
synchronized (calculator) {
- long byteslength = 0;
- // in case the sampler doesn't return the contents
- // we see if the bytes was set
- if (res.getResponseData() == null || res.getResponseData().length == 0) {
- byteslength = res.getBytes();
- } else {
- byteslength = res.getResponseData().length;
- }
+ long byteslength = res.getBytes();
// if there was more than 1 loop in the sample, we
// handle it appropriately
if (res.getSampleCount() > 1) {
Modified: jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java?rev=390535&r1=390534&r2=390535&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java Fri Mar 31 15:04:52 2006
@@ -131,7 +131,7 @@
JMeterVariables vars = getVariables();// Relatively expensive
// operation, so do it once
vars.put(name, defaultValue);
- if (previousResult == null || previousResult.getResponseData() == null) {
+ if (previousResult == null || previousResult.getResponseData().length == 0) {
return defaultValue;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org