Index: httpclient/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java =================================================================== --- httpclient/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java (revision 1444264) +++ httpclient/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java (working copy) @@ -274,7 +274,7 @@ final FileInputStream instream = new FileInputStream(trustStoreFile); try { trustStore.load(instream, trustStorePassword != null ? - trustStorePassword.toCharArray() : EMPTY_PASSWORD); + trustStorePassword.toCharArray() : null); } finally { instream.close(); }