You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2006/03/23 20:54:28 UTC
svn commit: r388250 - in /jakarta/jmeter/branches/rel-2-1:
src/functions/org/apache/jmeter/functions/SplitFunction.java
xdocs/changes.xml xdocs/usermanual/functions.xml
Author: sebb
Date: Thu Mar 23 11:54:27 2006
New Revision: 388250
URL: http://svn.apache.org/viewcvs?rev=388250&view=rev
Log:
__split() now deletes next free variable to make it work better with ForEach controller
Modified:
jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/SplitFunction.java
jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml
jakarta/jmeter/branches/rel-2-1/xdocs/usermanual/functions.xml
Modified: jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/SplitFunction.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/SplitFunction.java?rev=388250&r1=388249&r2=388250&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/SplitFunction.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/SplitFunction.java Thu Mar 23 11:54:27 2006
@@ -30,6 +30,8 @@
import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
+// @see org.apache.jmeter.functions.PackageTest for unit tests
+
/**
* Function to log a message
*
@@ -89,7 +91,8 @@
log.debug(parts[i-1]);
}
vars.put(varNamePrefix + "_" + i, parts[i - 1]);// $NON-NLS-1$
- }
+ }
+ vars.remove(varNamePrefix + "_" + (parts.length+1));
return stringToSplit;
}
Modified: jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml?rev=388250&r1=388249&r2=388250&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml Thu Mar 23 11:54:27 2006
@@ -52,6 +52,7 @@
<li>Can now save entire screen as an image, not just the right-hand pane</li>
<li>Bug 38901 - Add optional SOAPAction header to SOAP Sampler</li>
<li>New BeanShell test elements: Timer, PreProcessor, PostProcessor, Listener</li>
+<li>__split() function now clears next variable, so it can be used with ForEach Controller</li>
</ul>
<h4>Bug fixes:</h4>
Modified: jakarta/jmeter/branches/rel-2-1/xdocs/usermanual/functions.xml
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/xdocs/usermanual/functions.xml?rev=388250&r1=388249&r2=388250&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/xdocs/usermanual/functions.xml (original)
+++ jakarta/jmeter/branches/rel-2-1/xdocs/usermanual/functions.xml Thu Mar 23 11:54:27 2006
@@ -527,6 +527,8 @@
The split strings are returned in the variables ${VAR_1}, ${VAR_2} etc.
The count of variables is returned in ${VAR_n}.
From JMeter 2.1.2 onwards, a trailing delimiter is treated as a missing variable, and "?" is returned.
+ Also, to allow it to work better with the ForEach controller,
+ __split now deletes the first unused variable in case it was set by a previous split.
</p>
<p/>
Example:
@@ -547,6 +549,8 @@
VAR_3=c
<br/>
VAR_4=? (null in JMeter 2.1.1 and earlier)
+ <br/>
+ VAR_5=null (in JMeter 2.1.2 and later)
</code>
</description>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org