Author: sebb
Date: Tue Sep 23 02:48:14 2008
New Revision: 698112
URL: http://svn.apache.org/viewvc?rev=698112&view=rev
Log:
Revert r698045 - although it has the same effect in this case, setOnError is a
global setting, not a per-sample setting
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java?rev=698112&r1=698111&r2=698112&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
Tue Sep 23 02:48:14 2008
@@ -142,7 +142,7 @@
log.error("BeanShell Jar missing? " + ex.toString());
result.setError(true);
result.setFailureMessage("BeanShell Jar missing? " +
ex.toString());
-
JMeterContextService.getContext().getThread().setOnErrorStopThread(true); // No
point continuing
+ response.setStopThread(true); // No point continuing
} catch (Exception ex) // Mainly for bsh.EvalError
{
result.setError(true);
Modified:
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java?rev=698112&r1=698111&r2=698112&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
Tue Sep 23 02:48:14 2008
@@ -156,7 +156,7 @@
log.error("BeanShell Jar missing? " + ex.toString());
res.setResponseCode("501");//$NON-NLS-1$
res.setResponseMessage(ex.toString());
-
JMeterContextService.getContext().getThread().setOnErrorStopThread(true); // No
point continuing
+ response.setStopThread(true); // No point continuing
} catch (Exception ex) // Mainly for bsh.EvalError
{
log.warn(ex.toString());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
