The attached patch documents the change committed by Mike. The change is nowhere near as big as the file size would suggest - it would seem that cvs found a bunch of unchanged lines that it considered as updated.
Cheers, Scott -- Scott Eade Backstage Technologies Pty. Ltd. http://www.backstagetech.com.au .Mac Chat/AIM: seade at mac dot com > From: [EMAIL PROTECTED] > Reply-To: "JMeter Developers List" <[EMAIL PROTECTED]> > Date: 14 Dec 2002 01:23:45 -0000 > To: [EMAIL PROTECTED] > Subject: cvs commit: jakarta-jmeter/src/functions/org/apache/jmeter/functions > RegexFunction.java > > mstover1 2002/12/13 17:23:45 > > Modified: src/core/org/apache/jmeter/functions UnknownFunction.java > src/core/org/apache/jmeter/threads JMeterVariables.java > src/functions/org/apache/jmeter/functions RegexFunction.java > Log: > Regex function now stores whole template in given variable name, for > convenience. > > Revision Changes Path > 1.2 +1 -1 > jakarta-jmeter/src/core/org/apache/jmeter/functions/UnknownFunction.java > > Index: UnknownFunction.java > =================================================================== > RCS file: > /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/functions/UnknownFunction. > java,v > retrieving revision 1.1 > retrieving revision 1.2 > diff -u -r1.1 -r1.2 > --- UnknownFunction.java 16 Aug 2002 21:10:20 -0000 1.1 > +++ UnknownFunction.java 14 Dec 2002 01:23:44 -0000 1.2 > @@ -36,7 +36,7 @@ > public String execute(SampleResult previousResult, Sampler currentSampler) > throws InvalidVariableException { > String ret = getVariables().get(name); > - if(ret == null) > + if(ret == null || ret.length() == 0) > { > return "${"+name+"}"; > } > > > > 1.3 +6 -1 > jakarta-jmeter/src/core/org/apache/jmeter/threads/JMeterVariables.java > > Index: JMeterVariables.java > =================================================================== > RCS file: > /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/JMeterVariables.ja > va,v > retrieving revision 1.2 > retrieving revision 1.3 > diff -u -r1.2 -r1.3 > --- JMeterVariables.java 16 Aug 2002 21:10:21 -0000 1.2 > +++ JMeterVariables.java 14 Dec 2002 01:23:44 -0000 1.3 > @@ -46,7 +46,12 @@ > > public String get(String key) > { > - return (String)variables.get(key); > + String val = (String)variables.get(key); > + if(val == null) > + { > + return ""; > + } > + return val; > } > > } > > > > 1.7 +8 -0 > jakarta-jmeter/src/functions/org/apache/jmeter/functions/RegexFunction.java > > Index: RegexFunction.java > =================================================================== > RCS file: > /home/cvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/RegexFuncti > on.java,v > retrieving revision 1.6 > retrieving revision 1.7 > diff -u -r1.6 -r1.7 > --- RegexFunction.java 29 Aug 2002 18:17:41 -0000 1.6 > +++ RegexFunction.java 14 Dec 2002 01:23:45 -0000 1.7 > @@ -74,6 +74,7 @@ > */ > public String execute(SampleResult previousResult,Sampler currentSampler) > { > + getVariables().put(name,defaultValue); > if(previousResult == null || previousResult.getResponseData() == null) > { > return defaultValue; > @@ -90,6 +91,11 @@ > } > } catch(NumberFormatException e) { > log.error("",e); > + return defaultValue; > + } > + catch(Exception e) > + { > + return defaultValue; > } > if(collectAllMatches.size() == 0) > { > @@ -167,6 +173,8 @@ > result.append(match.group(((Integer)template[a]).intValue())); > } > } > + JMeterVariables vars = getVariables(); > + vars.put(name,result.toString()); > return result.toString(); > } > > > > > > -- > To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> > For additional commands, e-mail: <mailto:[EMAIL PROTECTED]> >
component_reference-patch.txt
Description: Binary data
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
