Author: sebb
Date: Thu Mar 17 00:49:18 2011
New Revision: 1082358
URL: http://svn.apache.org/viewvc?rev=1082358&view=rev
Log:
Don't override system TrustManager by default
Removed:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3STrustManager.java
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3SClient.java
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3SClient.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3SClient.java?rev=1082358&r1=1082357&r2=1082358&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3SClient.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3SClient.java
Thu Mar 17 00:49:18 2011
@@ -63,11 +63,11 @@ public class POP3SClient extends POP3Cli
private String[] protocols = //null;
null;//{"SSLv2", "SSLv3", "TLSv1", "TLSv1.1", "SSLv2Hello"};
- /** The FTPS {@link TrustManager} implementation. */
- private TrustManager trustManager = new POP3STrustManager();
+ /** The FTPS {@link TrustManager} implementation, default null. */
+ private TrustManager trustManager = null;
- /** The {@link KeyManager}. */
- private KeyManager keyManager = null; // seems not to be required
+ /** The {@link KeyManager}, default null. */
+ private KeyManager keyManager = null;
/**
* Constructor for POP3SClient.
@@ -222,6 +222,7 @@ public class POP3SClient extends POP3Cli
/**
* Set a {@link KeyManager} to use.
* @param newKeyManager The KeyManager implementation to set.
+ * @see org.apache.commons.net.util.KeyManagerUtils
*/
public void setKeyManager(KeyManager newKeyManager)
{
@@ -310,6 +311,7 @@ public class POP3SClient extends POP3Cli
/**
* Override the default {@link TrustManager} to use.
* @param newTrustManager The TrustManager implementation to set.
+ * @see org.apache.commons.net.util.TrustManagerUtils
*/
public void setTrustManager(TrustManager newTrustManager)
{
