Author: sebb
Date: Fri Jun 25 16:21:59 2010
New Revision: 958020
URL: http://svn.apache.org/viewvc?rev=958020&view=rev
Log:
Catch misbehaved assertion classes
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java?rev=958020&r1=958019&r2=958020&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
Fri Jun 25 16:21:59 2010
@@ -604,7 +604,22 @@ public class JMeterThread implements Run
}
private void processAssertion(SampleResult result, Assertion assertion) {
- AssertionResult assertionResult = assertion.getResult(result);
+ AssertionResult assertionResult;
+ try {
+ assertionResult = assertion.getResult(result);
+ } catch (ThreadDeath e) {
+ throw e;
+ } catch (Error e) {
+ log.error("Error processing Assertion ",e);
+ assertionResult = new AssertionResult("Assertion failed! See log
file.");
+ assertionResult.setError(true);
+ assertionResult.setFailureMessage(e.toString());
+ } catch (Exception e) {
+ log.error("Exception processing Assertion ",e);
+ assertionResult = new AssertionResult("Assertion failed! See log
file.");
+ assertionResult.setError(true);
+ assertionResult.setFailureMessage(e.toString());
+ }
result.setSuccessful(result.isSuccessful() &&
!(assertionResult.isError() || assertionResult.isFailure()));
result.addAssertionResult(assertionResult);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
