mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Nicolas Capponi
19.32.2013 90457b4af6104b62a08a9e09fcc77360dc0c6f5c
refs
author Nicolas Capponi <nicolas.capponi@forgerock.com>
Thursday, September 19, 2013 12:32 +0200
committer Nicolas Capponi <nicolas.capponi@forgerock.com>
Thursday, September 19, 2013 12:32 +0200
commit90457b4af6104b62a08a9e09fcc77360dc0c6f5c
tree a2ffebdca13af3014f7856509398c1500ad822c9 tree | zip | gz
parent 62ae8829826f951bf5aa2bffa69d36eb51832219 view | diff
Fix OPENDJ-734 - NPE when attempting SSL connect with client certs
Review CR-1243

NPE happens when no trust password is given.

* ConnectionFactoryProvider.java :
- test for null value before converting to charArray
- fixed a unrelated copy-paste error (using trustStorePathArg instead of keyStorePathArg)

* Added a test class ConnectionFactoryProviderTest.java to check behavior in case no trust password is given
* Added a dummy-trustore in test resources, as this is needed for correct behavior of tested method getConnectionFactory
2 files added
1 files modified
88 ■■■■ changed files
opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProvider.java 23 ●●●●● diff | view | raw | blame | history
opendj-sdk/opendj3/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProviderTest.java 65 ●●●●● diff | view | raw | blame | history
opendj-sdk/opendj3/opendj-ldap-toolkit/src/test/resources/dummy-truststore diff | view | raw | blame | history