You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by se...@apache.org on 2011/04/18 15:58:55 UTC
svn commit: r1094578 -
/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeyManager.java
Author: sebb
Date: Mon Apr 18 13:58:55 2011
New Revision: 1094578
URL: http://svn.apache.org/viewvc?rev=1094578&view=rev
Log:
Javadoc; missing @Override
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeyManager.java
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeyManager.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeyManager.java?rev=1094578&r1=1094577&r2=1094578&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeyManager.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeyManager.java Mon Apr 18 13:58:55 2011
@@ -38,20 +38,18 @@ import javax.net.ssl.X509ExtendedKeyMana
*/
public final class ExtendedAliasKeyManager extends X509ExtendedKeyManager {
- private X509ExtendedKeyManager delegate;
+ private final X509ExtendedKeyManager delegate;
- private String serverKeyAlias;
+ private final String serverKeyAlias;
/**
* Constructor.
*
* @param mgr
* The X509KeyManager used as a delegate
- * @param keyStore
- * @param serverKeyAlias
+ * @param keyAlias
* The alias name of the server's keypair and supporting
* certificate chain
- * @param keyAlias
*/
public ExtendedAliasKeyManager(KeyManager mgr, String keyAlias) {
this.delegate = (X509ExtendedKeyManager) mgr;
@@ -188,13 +186,12 @@ public final class ExtendedAliasKeyManag
* @param issuers
* The list of acceptable CA issuer subject names, or null if it
* does not matter which issuers are used (ignored)
- * @param socket
- * The socket to be used for this connection. This parameter can
- * be null, in which case this method will return the most
- * generic alias to use (ignored)
+ * @param engine
+ * The engine to be used for this connection.
* @return The alias name for the desired key, or null if there are no
* matches
*/
+ @Override
public String chooseEngineClientAlias(String[] keyType,
Principal[] issuers, SSLEngine engine) {
return delegate.chooseEngineClientAlias(keyType, issuers, engine);
@@ -209,13 +206,12 @@ public final class ExtendedAliasKeyManag
* @param issuers
* The list of acceptable CA issuer subject names, or null if it
* does not matter which issuers are used (ignored)
- * @param socket
- * The socket to be used for this connection. This parameter can
- * be null, in which case this method will return the most
- * generic alias to use (ignored)
+ * @param engine
+ * The engine to be used for this connection.
*
* @return Alias name for the desired key
*/
+ @Override
public String chooseEngineServerAlias(String keyType, Principal[] issuers,
SSLEngine engine) {