jmeter-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sebb <seb...@gmail.com>
Subject Re: svn commit: r1353205 - in /jmeter/trunk: src/core/org/apache/jmeter/util/JsseSSLManager.java xdocs/changes.xml
Date Sun, 24 Jun 2012 00:38:22 GMT
On 23 June 2012 23:06,  <pmouawad@apache.org> wrote:
> Author: pmouawad
> Date: Sat Jun 23 22:06:21 2012
> New Revision: 1353205
>
> URL: http://svn.apache.org/viewvc?rev=1353205&view=rev
> Log:
> Bug 53440 - SSL connection leads to ArrayStoreException on JDK 6 with some KeyManagerFactory
SPI
> Bugzilla Id: 53440

Very good catch.

> Modified:
>    jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java
>    jmeter/trunk/xdocs/changes.xml
>
> 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=1353205&r1=1353204&r2=1353205&view=diff
> ==============================================================================
> --- jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java (original)
> +++ jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java Sat Jun 23 22:06:21
2012
> @@ -232,13 +232,17 @@ public class JsseSSLManager extends SSLM
>         JmeterKeyStore keys = this.getKeyStore();
>         managerFactory.init(null, defaultpw == null ? new char[]{} : defaultpw.toCharArray());
>         KeyManager[] managers = managerFactory.getKeyManagers();
> +        KeyManager[] newManagers = new KeyManager[managers.length];
> +
>         log.debug(keys.getClass().toString());
>
>         // Now wrap the default managers with our key manager
>         for (int i = 0; i < managers.length; i++) {
>             if (managers[i] instanceof X509KeyManager) {
>                 X509KeyManager manager = (X509KeyManager) managers[i];
> -                managers[i] = new WrappedX509KeyManager(manager, keys);
> +                newManagers[i] = new WrappedX509KeyManager(manager, keys);
> +            } else {
> +                newManagers[i] = managers[i];
>             }
>         }
>
> @@ -255,7 +259,7 @@ public class JsseSSLManager extends SSLM
>                     (X509TrustManager)trustmanagers[i]);
>             }
>         }
> -        context.init(managers, trustmanagers, this.rand);
> +        context.init(newManagers, trustmanagers, this.rand);
>         if (log.isDebugEnabled()){
>             String[] dCiphers = context.getSocketFactory().getDefaultCipherSuites();
>             String[] sCiphers = context.getSocketFactory().getSupportedCipherSuites();
> @@ -394,4 +398,9 @@ public class JsseSSLManager extends SSLM
>             return this.manager.chooseServerAlias(arg0, arg1, arg2);
>         }
>     }
> +
> +    public static void main(String[] args) {
> +        Number[] t = new Integer[5];
> +        t[0] = new Long(123);
> +    }
>  }

But I think the example code is not needed !

>
> Modified: jmeter/trunk/xdocs/changes.xml
> URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1353205&r1=1353204&r2=1353205&view=diff
> ==============================================================================
> --- jmeter/trunk/xdocs/changes.xml (original)
> +++ jmeter/trunk/xdocs/changes.xml Sat Jun 23 22:06:21 2012
> @@ -65,6 +65,8 @@ or a Debug Sampler with all fields set t
>  <ul>
>  <li><bugzilla>53348</bugzilla> - JMeter JMS Point-to-Point Request-Response
sampler doesn't work when Request-queue and Receive-queue are different</li>
>  <li><bugzilla>53357</bugzilla> - JMS Point to Point reports too high
response times in Request Response Mode</li>
> +<li><bugzilla>53440</bugzilla> - SSL connection leads to ArrayStoreException
on JDK 6 with some KeyManagerFactory SPI</li>
> +
>  </ul>
>
>  <h3>Controllers</h3>
>
>

Mime
View raw message