svn commit: r833501 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java

[Gump-build]

Author: sebb
Date: Fri Nov  6 18:00:46 2009
New Revision: 833501

URL: http://svn.apache.org/viewvc?rev=833501&view=rev
Log:
Avoid NPE if script does not return a value

Modified:
    jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java

Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java?rev=833501&r1=833500&r2=833501&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java Fri Nov  6 18:00:46 2009
@@ -39,6 +39,10 @@
                 return 0;
             }
             Object o = evalFileOrScript(mgr);
+            if (o == null) {
+                log.warn("Script did not return a value");
+                return 0;
+            }
             delay = Long.valueOf(o.toString()).longValue();
         } catch (NumberFormatException e) {
             log.warn("Problem in BSF script "+e);



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@...
For additional commands, e-mail: jmeter-dev-help@...