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/06/21 03:38:04 UTC
incubator-geode git commit: GEODE-420: Fixed ssl property settings
for "javax.ssl.*"
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-420 134d729a0 -> 8e8337dde
GEODE-420: Fixed ssl property settings for "javax.ssl.*"
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8e8337dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8e8337dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8e8337dd
Branch: refs/heads/feature/GEODE-420
Commit: 8e8337ddeb05df1bb854b3dea70da26760dab7d4
Parents: 134d729
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Tue Jun 21 13:37:04 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Tue Jun 21 13:37:04 2016 +1000
----------------------------------------------------------------------
.../gemfire/distributed/internal/DistributionConfigImpl.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8e8337dd/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
index b5a415e..dfda8b7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
@@ -2071,6 +2071,14 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
// use sslProperties as base and let props with suffix GATEWAY_SSL_PROPS_SUFFIX override that base
this.gatewaySslProperties.setProperty(attName, attValue);
}
+ if (!this.httpServiceSSLProperties.containsKey(attName)) {
+ // use sslProperties as base and let props with suffix GATEWAY_SSL_PROPS_SUFFIX override that base
+ this.httpServiceSSLProperties.setProperty(attName, attValue);
+ }
+ if (!this.clusterSSLProperties.containsKey(attName)) {
+ // use sslProperties as base and let props with suffix GATEWAY_SSL_PROPS_SUFFIX override that base
+ this.clusterSSLProperties.setProperty(attName, attValue);
+ }
}
}