Mailing-List: contact dev-help@jmeter.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@jmeter.apache.org
Received-SPF: pass (athena.apache.org: domain of sebbaz@gmail.com designates
 209.85.212.43 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <20120204143243.8607F23888CD@eris.apache.org>
References: <20120204143243.8607F23888CD@eris.apache.org>
Date: Sat, 4 Feb 2012 14:41:40 +0000
Message-ID: 
 <CAOGo0VZbLA7-s66=eiDtV9+W55kaND34J9cyx1j_11KSYx2T+A@mail.gmail.com>
Subject: Re: svn commit: r1240507 - in /jmeter/trunk: bin/jmeter.properties
 src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java
 xdocs/changes.xml
From: sebb <sebbaz@gmail.com>
To: dev@jmeter.apache.org
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

On 4 February 2012 14:32,  <pmouawad@apache.org> wrote:
> Author: pmouawad
> Date: Sat Feb =A04 14:32:42 2012
> New Revision: 1240507
>
> URL: http://svn.apache.org/viewvc?rev=3D1240507&view=3Drev
> Log:
> Bug 51737 - TCPSampler : Packet gets converted/corrupted

That's fine as far as it goes, but the SampleResult needs to be
updated with the encoding used.

Also the new property needs to be documented in component_reference please.

> Modified:
> =A0 =A0jmeter/trunk/bin/jmeter.properties
> =A0 =A0jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampl=
er/TCPClientImpl.java
> =A0 =A0jmeter/trunk/xdocs/changes.xml
>
> Modified: jmeter/trunk/bin/jmeter.properties
> URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=
=3D1240507&r1=3D1240506&r2=3D1240507&view=3Ddiff
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- jmeter/trunk/bin/jmeter.properties (original)
> +++ jmeter/trunk/bin/jmeter.properties Sat Feb =A04 14:32:42 2012
> @@ -604,6 +604,10 @@ wmlParser.types=3Dtext/vnd.wap.wml
> =A0# set this to a value outside the range -128 to +127 to skip eol check=
ing
> =A0#tcp.eolByte=3D1000
> =A0#
> +# TCP Charset, used by org.apache.jmeter.protocol.tcp.sampler.TCPClientI=
mpl
> +# default to Platform defaults charset as returned by Charset.defaultCha=
rset().name()
> +#tcp.charset=3D
> +#
> =A0# status.prefix and suffix =3D strings that enclose the status respons=
e code
> =A0#tcp.status.prefix=3DStatus=3D
> =A0#tcp.status.suffix=3D.
>
> Modified: jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sa=
mpler/TCPClientImpl.java
> URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/tcp/org/apach=
e/jmeter/protocol/tcp/sampler/TCPClientImpl.java?rev=3D1240507&r1=3D1240506=
&r2=3D1240507&view=3Ddiff
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/=
TCPClientImpl.java (original)
> +++ jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/=
TCPClientImpl.java Sat Feb =A04 14:32:42 2012
> @@ -30,7 +30,9 @@ import java.io.ByteArrayOutputStream;
> =A0import java.io.IOException;
> =A0import java.io.InputStream;
> =A0import java.io.OutputStream;
> +import java.nio.charset.Charset;
>
> +import org.apache.commons.lang.StringUtils;
> =A0import org.apache.jmeter.util.JMeterUtils;
> =A0import org.apache.jorphan.logging.LoggingManager;
> =A0import org.apache.log.Logger;
> @@ -46,6 +48,7 @@ public class TCPClientImpl extends Abstr
> =A0 =A0 private static final Logger log =3D LoggingManager.getLoggerForCl=
ass();
>
> =A0 =A0 private int eolInt =3D JMeterUtils.getPropDefault("tcp.eolByte", =
1000); // $NON-NLS-1$
> + =A0 =A0private String charset =3D JMeterUtils.getPropDefault("tcp.chars=
et", Charset.defaultCharset().name()); // $NON-NLS-1$
> =A0 =A0 // default is not in range of a byte
>
> =A0 =A0 public TCPClientImpl() {
> @@ -54,13 +57,19 @@ public class TCPClientImpl extends Abstr
> =A0 =A0 =A0 =A0 if (useEolByte) {
> =A0 =A0 =A0 =A0 =A0 =A0 log.info("Using eolByte=3D" + eolByte);
> =A0 =A0 =A0 =A0 }
> + =A0 =A0 =A0 =A0String charset =3D JMeterUtils.getProperty("tcp.charset"=
);
> + =A0 =A0 =A0 =A0if(StringUtils.isEmpty(charset)) {
> + =A0 =A0 =A0 =A0 =A0 =A0log.info("Using platform default charset:"+chars=
et);
> + =A0 =A0 =A0 =A0} else {
> + =A0 =A0 =A0 =A0 =A0 =A0log.info("Using charset:"+charset);
> + =A0 =A0 =A0 =A0}
> =A0 =A0 }
>
> =A0 =A0 /**
> =A0 =A0 =A0* {@inheritDoc}
> =A0 =A0 =A0*/
> =A0 =A0 public void write(OutputStream os, String s) =A0throws IOExceptio=
n{
> - =A0 =A0 =A0 =A0os.write(s.getBytes()); // TODO - charset?
> + =A0 =A0 =A0 =A0os.write(s.getBytes(charset));
> =A0 =A0 =A0 =A0 os.flush();
> =A0 =A0 =A0 =A0 if(log.isDebugEnabled()) {
> =A0 =A0 =A0 =A0 =A0 =A0 log.debug("Wrote: " + s);
> @@ -99,7 +108,7 @@ public class TCPClientImpl extends Abstr
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if(log.isDebugEnabled()) {
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0log.debug("Read: "=
 + w.size() + "\n" + w.toString());
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0}
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 return w.toString();
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 return w.toString(charset);
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0} catch (IOException e) {
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0throw new ReadException(""=
, e, w.toString());
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0}
>
> Modified: jmeter/trunk/xdocs/changes.xml
> URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=3D12=
40507&r1=3D1240506&r2=3D1240507&view=3Ddiff
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- jmeter/trunk/xdocs/changes.xml (original)
> +++ jmeter/trunk/xdocs/changes.xml Sat Feb =A04 14:32:42 2012
> @@ -71,6 +71,7 @@ or a Debug Sampler with all fields set t
>
> =A0<h3>Other Samplers</h3>
> =A0<ul>
> +<li>Bug 51737 - TCPSampler : Packet gets converted/corrupted</li>
> =A0</ul>
>
> =A0<h3>Controllers</h3>
>
>