Author: sebb
Date: Tue Nov 3 19:38:28 2009
New Revision: 832524
URL: http://svn.apache.org/viewvc?rev=832524&view=rev
Log:
Check the JSR223 script returns a value
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223Timer.java
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223Timer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223Timer.java?rev=832524&r1=832523&r2=832524&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223Timer.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223Timer.java
Tue Nov 3 19:38:28 2009
@@ -42,6 +42,10 @@
return 0;
}
Object o = processFileOrScript(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 JSR223 script "+e);
Modified:
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java?rev=832524&r1=832523&r2=832524&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
Tue Nov 3 19:38:28 2009
@@ -60,8 +60,10 @@
result.setSuccessful(true);
result.setResponseCodeOK();
result.setResponseMessageOK();
- // TODO what encoding to use?
- result.setResponseData(ret.toString().getBytes());
+ if (ret != null){
+ // TODO what encoding to use?
+ result.setResponseData(ret.toString().getBytes());
+ }
} catch (IOException e) {
log.warn("Problem in JSR223 script "+e);
result.setSuccessful(false);
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
