From commits-return-674-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Sat Feb 4 18:34:22 2012 Return-Path: X-Original-To: apmail-jmeter-commits-archive@minotaur.apache.org Delivered-To: apmail-jmeter-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E4B59981D for ; Sat, 4 Feb 2012 18:34:21 +0000 (UTC) Received: (qmail 78892 invoked by uid 500); 4 Feb 2012 18:34:20 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 78870 invoked by uid 500); 4 Feb 2012 18:34:19 -0000 Mailing-List: contact commits-help@jmeter.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jmeter.apache.org Delivered-To: mailing list commits@jmeter.apache.org Received: (qmail 78755 invoked by uid 99); 4 Feb 2012 18:34:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Feb 2012 18:34:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Feb 2012 18:34:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7135823888D2 for ; Sat, 4 Feb 2012 18:33:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1240582 - /jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java Date: Sat, 04 Feb 2012 18:33:56 -0000 To: commits@jmeter.apache.org From: pmouawad@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120204183356.7135823888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pmouawad Date: Sat Feb 4 18:33:56 2012 New Revision: 1240582 URL: http://svn.apache.org/viewvc?rev=1240582&view=rev Log: Ensure terminate is called Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java?rev=1240582&r1=1240581&r2=1240582&view=diff ============================================================================== --- jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java (original) +++ jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java Sat Feb 4 18:33:56 2012 @@ -33,8 +33,9 @@ public class BSFTimer extends BSFTestEle /** {@inheritDoc} */ public long delay() { long delay = 0; + BSFManager mgr = null; try { - BSFManager mgr = getManager(); + mgr = getManager(); Object o = evalFileOrScript(mgr); if (o == null) { log.warn("Script did not return a value"); @@ -45,6 +46,10 @@ public class BSFTimer extends BSFTestEle log.warn("Problem in BSF script "+e); } catch (BSFException e) { log.warn("Problem in BSF script "+e); + } finally { + if(mgr != null) { + mgr.terminate(); + } } return delay; }