geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [2/2] incubator-geode git commit: Add system properties during construction of instance
Date Fri, 07 Oct 2016 17:27:56 GMT
Add system properties during construction of instance


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/2c47e5c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/2c47e5c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/2c47e5c4

Branch: refs/heads/feature/GEM-1032
Commit: 2c47e5c4684d4c678e9b71858cc2068c84638945
Parents: ed1defc
Author: Kirk Lund <klund@apache.org>
Authored: Fri Oct 7 10:28:03 2016 -0700
Committer: Kirk Lund <klund@apache.org>
Committed: Fri Oct 7 10:28:03 2016 -0700

----------------------------------------------------------------------
 .../internal/membership/gms/auth/GMSAuthenticator.java       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2c47e5c4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticator.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticator.java
index 970ffbf..b516b73 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticator.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticator.java
@@ -44,13 +44,13 @@ public class GMSAuthenticator implements Authenticator {
   private final static int SYS_PREFIX_LEN = (GEMFIRE_PREFIX + "sys.").length();
 
   private Services services;
-  private Properties securityProps;
+  private Properties securityProps = addSystemSecurityProps(new Properties());
   private SecurityService securityService = IntegratedSecurityService.getSecurityService();
 
   @Override
   public void init(Services s) {
     this.services = s;
-    this.securityProps = addSystemSecurityProps(new Properties(this.services.getConfig().getDistributionConfig().getSecurityProps()));
+    addSecurityProperties(this.services.getConfig().getDistributionConfig().getSecurityProps());
   }
 
   @Override
@@ -206,6 +206,10 @@ public class GMSAuthenticator implements Authenticator {
   public void emergencyClose() {
   }
 
+  private void addSecurityProperties(final Properties propsToAdd) {
+    this.securityProps.putAll(propsToAdd);
+  }
+
   private static Properties addSystemSecurityProps(final Properties props) {
     Set keys = System.getProperties().keySet();
     for (Object key: keys) {


Mime
View raw message