qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kw...@apache.org
Subject qpid-broker-j git commit: QPID-8016: [Broker-J] Delegate consistently to the client methods of underlying KeyManager too
Date Mon, 19 Mar 2018 09:30:01 GMT
Repository: qpid-broker-j
Updated Branches:
  refs/heads/7.0.x 6d26e38ab -> 699533530


QPID-8016: [Broker-J] Delegate consistently to the client methods of underlying KeyManager
too


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/69953353
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/69953353
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/69953353

Branch: refs/heads/7.0.x
Commit: 6995335307b60d4b365cbc0c235a98a3624bc9a6
Parents: 6d26e38
Author: Keith Wall <kwall@apache.org>
Authored: Mon Mar 19 09:29:17 2018 +0000
Committer: Keith Wall <kwall@apache.org>
Committed: Mon Mar 19 09:29:21 2018 +0000

----------------------------------------------------------------------
 .../transport/network/security/ssl/QpidServerX509KeyManager.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/69953353/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidServerX509KeyManager.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidServerX509KeyManager.java
b/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidServerX509KeyManager.java
index c75d781..df99188 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidServerX509KeyManager.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidServerX509KeyManager.java
@@ -51,7 +51,7 @@ public class QpidServerX509KeyManager extends X509ExtendedKeyManager
     @Override
     public String chooseClientAlias(String[] keyType, Principal[] issuers, Socket socket)
     {
-        return _delegate.chooseClientAlias(keyType, issuers, socket);
+        return _alias != null ? _alias : _delegate.chooseClientAlias(keyType, issuers, socket);
     }
 
     @Override
@@ -87,7 +87,7 @@ public class QpidServerX509KeyManager extends X509ExtendedKeyManager
     @Override
     public String chooseEngineClientAlias(String[] keyType, Principal[] issuers, SSLEngine
engine)
     {
-        return _delegate.chooseEngineClientAlias(keyType, issuers, engine);
+        return _alias != null ? _alias : _delegate.chooseEngineClientAlias(keyType, issuers,
engine);
     }
 
     @Override


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message