jmeter-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Philippe Mouawad <philippe.moua...@gmail.com>
Subject Re: svn commit: r1731389 - in /jmeter/trunk/src: core/org/apache/jmeter/util/JsseSSLManager.java protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
Date Tue, 23 Feb 2016 20:58:17 GMT
Fixed

On Mon, Feb 22, 2016 at 1:25 PM, sebb <sebbaz@gmail.com> wrote:

> On 20 February 2016 at 12:31,  <pmouawad@apache.org> wrote:
> > Author: pmouawad
> > Date: Sat Feb 20 12:31:38 2016
> > New Revision: 1731389
> >
> > URL: http://svn.apache.org/viewvc?rev=1731389&view=rev
> > Log:
> > #resolve #133
>
> -1
>
> This is not helpful as a commit log message.
>
> The Bug ref or some other explanation is needed.
> Please fix the message.
>
> >
> > Modified:
> >     jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java
> >
>  jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
> >
> > Modified:
> jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java
> > URL:
> http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java?rev=1731389&r1=1731388&r2=1731389&view=diff
> >
> ==============================================================================
> > --- jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java
> (original)
> > +++ jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java Sat
> Feb 20 12:31:38 2016
> > @@ -412,8 +412,8 @@ public class JsseSSLManager extends SSLM
> >           * @see javax.net.ssl.X509KeyManager#chooseServerAlias(String,
> Principal[], Socket)
> >           */
> >          @Override
> > -        public String chooseServerAlias(String arg0, Principal[] arg1,
> Socket arg2) {
> > -            return this.manager.chooseServerAlias(arg0, arg1, arg2);
> > +        public String chooseServerAlias(String keyType, Principal[]
> issuers, Socket socket) {
> > +            return this.manager.chooseServerAlias(keyType, issuers,
> socket);
> >          }
> >      }
> >  }
> >
> > Modified:
> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
> > URL:
> http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java?rev=1731389&r1=1731388&r2=1731389&view=diff
> >
> ==============================================================================
> > ---
> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
> (original)
> > +++
> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
> Sat Feb 20 12:31:38 2016
> > @@ -1352,19 +1352,6 @@ public class HTTPHC4Impl extends HTTPHCA
> >          }
> >      }
> >
> > -    /**
> > -     * If contentEncoding is not set by user, then Platform encoding
> will be used to convert to String
> > -     * @param putParams {@link HttpParams}
> > -     * @return String charset
> > -     */
> > -    protected String getCharsetWithDefault(HttpParams putParams) {
> > -        String charset =(String)
> putParams.getParameter(CoreProtocolPNames.HTTP_CONTENT_CHARSET);
> > -        if(StringUtils.isEmpty(charset)) {
> > -            charset = Charset.defaultCharset().name();
> > -        }
> > -        return charset;
> > -    }
> > -
> >      private void saveConnectionCookies(HttpResponse method, URL u,
> CookieManager cookieManager) {
> >          if (cookieManager != null) {
> >              Header[] hdrs =
> method.getHeaders(HTTPConstants.HEADER_SET_COOKIE);
> >
> >
>



-- 
Cordialement.
Philippe Mouawad.

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message