View | Details | Raw Unified | Return to bug 50928
Collapse All | Expand All

(-)java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java (-2 / +6 lines)
Lines 474-480 Link Here
474
        } catch(Exception e) {
474
        } catch(Exception e) {
475
            if( e instanceof IOException )
475
            if( e instanceof IOException )
476
                throw (IOException)e;
476
                throw (IOException)e;
477
            throw new IOException(e.getMessage());
477
            throw new IOException(e.getMessage(), e);
478
        }
478
        }
479
    }
479
    }
480
480
Lines 565-571 Link Here
565
        }
565
        }
566
566
567
        KeyManagerFactory kmf = KeyManagerFactory.getInstance(algorithm);
567
        KeyManagerFactory kmf = KeyManagerFactory.getInstance(algorithm);
568
        kmf.init(ks, keystorePass.toCharArray());
568
        String keyPass = endpoint.getKeyPass();
569
        if (keyPass == null) {
570
            keyPass = keystorePass;
571
        }
572
        kmf.init(ks, keyPass.toCharArray());
569
573
570
        kms = kmf.getKeyManagers();
574
        kms = kmf.getKeyManagers();
571
        if (keyAlias != null) {
575
        if (keyAlias != null) {

Return to bug 50928