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 2005/10/20 02:15:43 UTC
svn commit: r326761 - in /jakarta/jmeter/branches/rel-2-1/src:
functions/org/apache/jmeter/functions/RegexFunction.java
protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
Author: sebb
Date: Wed Oct 19 17:15:29 2005
New Revision: 326761
URL: http://svn.apache.org/viewcvs?rev=326761&view=rev
Log:
Bug 37140 - handle encoding better
Modified:
jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java
jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
Modified: jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java?rev=326761&r1=326760&r2=326761&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java Wed Oct 19 17:15:29 2005
@@ -18,6 +18,7 @@
package org.apache.jmeter.functions;
import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -132,16 +133,18 @@
List collectAllMatches = new ArrayList();
try {
PatternMatcher matcher = (PatternMatcher) localMatcher.get();
- String responseText = new String(previousResult.getResponseData());
+ String responseText = new String(previousResult.getResponseData(),
+ previousResult.getDataEncoding()); // Bug 37140
PatternMatcherInput input = new PatternMatcherInput(responseText);
while (matcher.contains(input, searchPattern)) {
MatchResult match = matcher.getMatch();
collectAllMatches.add(match);
}
- } catch (NumberFormatException e) {
+ } catch (NumberFormatException e) {//TODO: can this occur?
log.error("", e);
return defaultValue;
- } catch (Exception e) {
+ } catch (UnsupportedEncodingException e) {
+ log.error("Can't convert ResponseData", e);
return defaultValue;
} finally {
vars.put(name + "_matchNr", "" + collectAllMatches.size());
Modified: jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=326761&r1=326760&r2=326761&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java Wed Oct 19 17:15:29 2005
@@ -729,6 +729,8 @@
totalRes.setResponseMessage(lastRes.getResponseMessage());
totalRes.setDataType(lastRes.getDataType());
totalRes.setResponseHeaders(lastRes.getResponseHeaders());
+ totalRes.setContentType(lastRes.getContentType());
+ totalRes.setDataEncoding(lastRes.getDataEncoding());
return totalRes;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org
Re: svn commit: r326761 - in /jakarta/jmeter/branches/rel-2-1/src: functions/org/apache/jmeter/functions/RegexFunction.java protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
Posted by sebb <se...@gmail.com>.
I've not updated the contributor list (ever ..)
S.
On 20/10/05, Peter Lin <wo...@gmail.com> wrote:
> I was just about to look at the patch. you beat me to it. thanks sebb. did
> we already add the user to the contributor list? I can do that if we
> haven't.
>
>
> peter
>
>
> On 10/19/05, sebb@apache.org <se...@apache.org> wrote:
> >
> > Author: sebb
> > Date: Wed Oct 19 17:15:29 2005
> > New Revision: 326761
> >
> > URL: http://svn.apache.org/viewcvs?rev=326761&view=rev
> > Log:
> > Bug 37140 - handle encoding better
> >
> > Modified:
> >
> > jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java
> >
> > jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
> >
> > Modified:
> > jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java
> > URL:
> > http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java?rev=326761&r1=326760&r2=326761&view=diff
> >
> > ==============================================================================
> > ---
> > jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java
> > (original)
> > +++
> > jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java
> > Wed Oct 19 17:15:29 2005
> > @@ -18,6 +18,7 @@
> > package org.apache.jmeter.functions;
> >
> > import java.io.Serializable;
> > +import java.io.UnsupportedEncodingException;
> > import java.util.ArrayList;
> > import java.util.Collection;
> > import java.util.Iterator;
> > @@ -132,16 +133,18 @@
> > List collectAllMatches = new ArrayList();
> > try {
> > PatternMatcher matcher = (PatternMatcher) localMatcher.get();
> > - String responseText = new String(previousResult.getResponseData());
> > + String responseText = new String(previousResult.getResponseData(),
> > + previousResult.getDataEncoding()); // Bug 37140
> > PatternMatcherInput input = new PatternMatcherInput(responseText);
> > while (matcher.contains(input, searchPattern)) {
> > MatchResult match = matcher.getMatch();
> > collectAllMatches.add(match);
> > }
> > - } catch (NumberFormatException e) {
> > + } catch (NumberFormatException e) {//TODO: can this occur?
> > log.error("", e);
> > return defaultValue;
> > - } catch (Exception e) {
> > + } catch (UnsupportedEncodingException e) {
> > + log.error("Can't convert ResponseData", e);
> > return defaultValue;
> > } finally {
> > vars.put(name + "_matchNr", "" + collectAllMatches.size());
> >
> > Modified:
> > jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
> > URL:
> > http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=326761&r1=326760&r2=326761&view=diff
> >
> > ==============================================================================
> > ---
> > jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
> > (original)
> > +++
> > jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
> > Wed Oct 19 17:15:29 2005
> > @@ -729,6 +729,8 @@
> > totalRes.setResponseMessage(lastRes.getResponseMessage());
> > totalRes.setDataType(lastRes.getDataType());
> > totalRes.setResponseHeaders(lastRes.getResponseHeaders());
> > + totalRes.setContentType(lastRes.getContentType());
> > + totalRes.setDataEncoding(lastRes.getDataEncoding());
> > return totalRes;
> > }
> >
> >
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
> > For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org
> >
> >
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org
Re: svn commit: r326761 - in /jakarta/jmeter/branches/rel-2-1/src: functions/org/apache/jmeter/functions/RegexFunction.java protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
Posted by Peter Lin <wo...@gmail.com>.
I was just about to look at the patch. you beat me to it. thanks sebb. did
we already add the user to the contributor list? I can do that if we
haven't.
peter
On 10/19/05, sebb@apache.org <se...@apache.org> wrote:
>
> Author: sebb
> Date: Wed Oct 19 17:15:29 2005
> New Revision: 326761
>
> URL: http://svn.apache.org/viewcvs?rev=326761&view=rev
> Log:
> Bug 37140 - handle encoding better
>
> Modified:
>
> jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java
>
> jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
>
> Modified:
> jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java
> URL:
> http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java?rev=326761&r1=326760&r2=326761&view=diff
>
> ==============================================================================
> ---
> jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java
> (original)
> +++
> jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/RegexFunction.java
> Wed Oct 19 17:15:29 2005
> @@ -18,6 +18,7 @@
> package org.apache.jmeter.functions;
>
> import java.io.Serializable;
> +import java.io.UnsupportedEncodingException;
> import java.util.ArrayList;
> import java.util.Collection;
> import java.util.Iterator;
> @@ -132,16 +133,18 @@
> List collectAllMatches = new ArrayList();
> try {
> PatternMatcher matcher = (PatternMatcher) localMatcher.get();
> - String responseText = new String(previousResult.getResponseData());
> + String responseText = new String(previousResult.getResponseData(),
> + previousResult.getDataEncoding()); // Bug 37140
> PatternMatcherInput input = new PatternMatcherInput(responseText);
> while (matcher.contains(input, searchPattern)) {
> MatchResult match = matcher.getMatch();
> collectAllMatches.add(match);
> }
> - } catch (NumberFormatException e) {
> + } catch (NumberFormatException e) {//TODO: can this occur?
> log.error("", e);
> return defaultValue;
> - } catch (Exception e) {
> + } catch (UnsupportedEncodingException e) {
> + log.error("Can't convert ResponseData", e);
> return defaultValue;
> } finally {
> vars.put(name + "_matchNr", "" + collectAllMatches.size());
>
> Modified:
> jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
> URL:
> http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=326761&r1=326760&r2=326761&view=diff
>
> ==============================================================================
> ---
> jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
> (original)
> +++
> jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
> Wed Oct 19 17:15:29 2005
> @@ -729,6 +729,8 @@
> totalRes.setResponseMessage(lastRes.getResponseMessage());
> totalRes.setDataType(lastRes.getDataType());
> totalRes.setResponseHeaders(lastRes.getResponseHeaders());
> + totalRes.setContentType(lastRes.getContentType());
> + totalRes.setDataEncoding(lastRes.getDataEncoding());
> return totalRes;
> }
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org
>
>