You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2012/02/04 19:31:47 UTC
svn commit: r1240579 -
/jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java
Author: pmouawad
Date: Sat Feb 4 18:31:46 2012
New Revision: 1240579
URL: http://svn.apache.org/viewvc?rev=1240579&view=rev
Log:
Ensure terminate is called
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java?rev=1240579&r1=1240578&r2=1240579&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java Sat Feb 4 18:31:46 2012
@@ -34,18 +34,22 @@ public class BSFAssertion extends BSFTes
public AssertionResult getResult(SampleResult response) {
AssertionResult result = new AssertionResult(getName());
+ BSFManager mgr =null;
try {
- BSFManager mgr = getManager();
+ mgr = getManager();
mgr.declareBean("SampleResult", response, SampleResult.class);
mgr.declareBean("AssertionResult", result, AssertionResult.class);
processFileOrScript(mgr);
- mgr.terminate();
result.setError(false);
} catch (BSFException e) {
log.warn("Problem in BSF script "+e);
result.setFailure(true);
result.setError(true);
result.setFailureMessage(e.toString());
+ } finally {
+ if(mgr != null) {
+ mgr.terminate();
+ }
}
return result;
}