Author: sebb
Date: Sat Mar 6 21:37:34 2010
New Revision: 919857
URL: http://svn.apache.org/viewvc?rev=919857&view=rev
Log:
Eliminate unnecessary instance variable
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java?rev=919857&r1=919856&r2=919857&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java
Sat Mar 6 21:37:34 2010
@@ -37,8 +37,6 @@
private static final long serialVersionUID = 233L;
- private transient String comparatorErrorMessage;// Only used for
communication with compareSize()
-
// * Static int to signify the type of logical comparitor to assert
public final static int EQUAL = 1;
@@ -79,9 +77,10 @@
resultSize = response.getBytes();
}
// is the Sample the correct size?
- if (!(compareSize(resultSize))) {
+ final String msg = compareSize(resultSize);
+ if (msg.length() > 0) {
result.setFailure(true);
- Object[] arguments = { new Long(resultSize),
comparatorErrorMessage, new Long(getAllowedSize()) };
+ Object[] arguments = { new Long(resultSize), msg, new
Long(getAllowedSize()) };
String message =
MessageFormat.format(JMeterUtils.getResString("size_assertion_failure"),
arguments); //$NON-NLS-1$
result.setFailureMessage(message);
}
@@ -142,7 +141,8 @@
* than eqaul, less than equal, .
*
*/
- private boolean compareSize(long resultSize) {
+ private String compareSize(long resultSize) {
+ String comparatorErrorMessage;
boolean result = false;
int comp = getCompOper();
switch (comp) {
@@ -175,6 +175,6 @@
comparatorErrorMessage = "ERROR - invalid condition";
break;
}
- return result;
+ return result ? "" : comparatorErrorMessage;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
