geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [3/3] geode git commit: Fixup
Date Thu, 15 Jun 2017 21:26:36 GMT
Fixup


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

Branch: refs/heads/feature/GEODE-3062-2
Commit: 23563dc00e85ec9579d09541ed88bee296a37957
Parents: a376881
Author: Kirk Lund <klund@apache.org>
Authored: Thu Jun 15 14:25:52 2017 -0700
Committer: Kirk Lund <klund@apache.org>
Committed: Thu Jun 15 14:25:52 2017 -0700

----------------------------------------------------------------------
 .../java/org/apache/geode/internal/cache/GemFireCacheImpl.java    | 3 ++-
 .../org/apache/geode/security/SecurityClusterConfigDUnitTest.java | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/23563dc0/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index bed85ee..f511a70 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -814,7 +814,8 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache,
Has
 
       this.configurationResponse = loadClusterConfig();
 
-      // apply the cluster's properties configuration and initialize security using that
configuration
+      // apply the cluster's properties configuration and initialize security using that
+      // configuration
       ClusterConfigurationLoader.applyClusterPropertiesConfiguration(this.configurationResponse,
           this.system.getConfig());
 

http://git-wip-us.apache.org/repos/asf/geode/blob/23563dc0/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
index 46767ff..d913893 100644
--- a/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
@@ -139,6 +139,8 @@ public class SecurityClusterConfigDUnitTest {
         () -> this.serverStarter.startServer(props, this.lsRule.getMember(0).getPort()))
             .isInstanceOf(GemFireConfigException.class).hasMessage(
                 LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION.toLocalizedString());
+
+    // this.serverStarter.startServer(props, this.lsRule.getMember(0).getPort());
   }
 
   @Test


Mime
View raw message