On 17 February 2012 16:56, <[email protected]> wrote: > Author: pmouawad > Date: Fri Feb 17 16:56:20 2012 > New Revision: 1245652 > > URL: http://svn.apache.org/viewvc?rev=1245652&view=rev > Log: > Bug 52678 - Proxy : When doing replacement of UserDefinedVariables, partial > values should not be substituted > > Modified: > > jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java > jmeter/trunk/xdocs/changes.xml > jmeter/trunk/xdocs/usermanual/component_reference.xml > > Modified: > jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java > URL: > http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java?rev=1245652&r1=1245651&r2=1245652&view=diff > ============================================================================== > --- > jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java > (original) > +++ > jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java > Fri Feb 17 16:56:20 2012 > @@ -75,7 +75,7 @@ public class ReplaceFunctionsWithStrings > String value = entry.getValue(); > if (regexMatch) { > try { > - pattern = compiler.compile(value); > + pattern = compiler.compile("\\b("+value+")\\b"); > input = Util.substitute(pm, pattern, > new StringSubstitution(FUNCTION_REF_PREFIX + key > + FUNCTION_REF_SUFFIX), > input, Util.SUBSTITUTE_ALL); > > Modified: jmeter/trunk/xdocs/changes.xml > URL: > http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1245652&r1=1245651&r2=1245652&view=diff > ============================================================================== > --- jmeter/trunk/xdocs/changes.xml (original) > +++ jmeter/trunk/xdocs/changes.xml Fri Feb 17 16:56:20 2012 > @@ -102,6 +102,7 @@ or a Debug Sampler with all fields set t > <li>Bug 52639 - JSplitPane divider for log panel should be hidden if log is > not activated</li> > <li>Bug 52672 - Change Controller action deletes all but one child > samplers</li> > <li>Bug 52694 - Deadlock in GUI related to non AWT Threads updating GUI</li> > +<li>Bug 52678 - Proxy : When doing replacement of UserDefinedVariables, > partial values should not be substituted</li>
This is a behavioural change, and also needs to be documented in the "Incompatible changes" section. > </ul> > > <!-- =================== Improvements =================== --> > > Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml > URL: > http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1245652&r1=1245651&r2=1245652&view=diff > ============================================================================== > --- jmeter/trunk/xdocs/usermanual/component_reference.xml (original) > +++ jmeter/trunk/xdocs/usermanual/component_reference.xml Fri Feb 17 16:56:20 > 2012 > @@ -5107,7 +5107,7 @@ This setting will also be needed when ru > as a comma-separated list of headers. > </property> > <property name="Add Assertions" required="Yes">Add a blank > assertion to each sampler?</property> > - <property name="Regex Matching" required="Yes">Use Regex > Matching when replacing variables?</property> > + <property name="Regex Matching" required="Yes">Use Regex > Matching when replacing variables? If checked replacement will use word > boundaries, ie it will only replace word matching values of variable, not > part of a word. A word boundary follows Perl5 definition and is equivalent to > \b.</property> > <property name="Type" required="Yes">Which type of sampler to > generate (the Java default or HTTPClient)</property> > <property name="Redirect Automatically" required="Yes">Set Redirect > Automatically in the generated samplers?</property> > <property name="Follow Redirects" required="Yes">Set Follow Redirects > in the generated samplers?</property> > >
