You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2016/07/28 22:35:47 UTC
incubator-geode git commit: GEODE-420: Reverting change on
SocketCreator.java
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-420 403bb2e75 -> 8a55435ab
GEODE-420: Reverting change on SocketCreator.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8a55435a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8a55435a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8a55435a
Branch: refs/heads/feature/GEODE-420
Commit: 8a55435abc133fb87e0f6f38ffb7e0442add3933
Parents: 403bb2e
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Thu Jul 28 15:35:44 2016 -0700
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Jul 28 15:35:44 2016 -0700
----------------------------------------------------------------------
.../gemfire/internal/net/SocketCreator.java | 22 ++++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8a55435a/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketCreator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketCreator.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketCreator.java
index 44f3331..3107f2a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketCreator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketCreator.java
@@ -620,19 +620,19 @@ public class SocketCreator {
@Override
public String chooseServerAlias(String keyType, Principal[] issuers, Socket socket) {
- // if (!StringUtils.isEmpty(this.keyAlias)) {
- // PrivateKey key = this.delegate.getPrivateKey(this.keyAlias);
- // return getKeyAlias(keyType, key);
- // }
+ if (!StringUtils.isEmpty(this.keyAlias)) {
+ PrivateKey key = this.delegate.getPrivateKey(this.keyAlias);
+ return getKeyAlias(keyType, key);
+ }
return this.delegate.chooseServerAlias(keyType, issuers, socket);
}
@Override
public X509Certificate[] getCertificateChain(final String s) {
- // if (!StringUtils.isEmpty(this.keyAlias)) {
- // return delegate.getCertificateChain(keyAlias);
- // }
+ if (!StringUtils.isEmpty(this.keyAlias)) {
+ return delegate.getCertificateChain(keyAlias);
+ }
return delegate.getCertificateChain(s);
}
@@ -643,10 +643,10 @@ public class SocketCreator {
@Override
public String chooseEngineServerAlias(final String keyType, final Principal[] principals, final SSLEngine sslEngine) {
- // if (!StringUtils.isEmpty(this.keyAlias)) {
- // PrivateKey key = this.delegate.getPrivateKey(this.keyAlias);
- // return getKeyAlias(keyType, key);
- // }
+ if (!StringUtils.isEmpty(this.keyAlias)) {
+ PrivateKey key = this.delegate.getPrivateKey(this.keyAlias);
+ return getKeyAlias(keyType, key);
+ }
return this.delegate.chooseEngineServerAlias(keyType, principals, sslEngine);
}