You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2016/07/07 22:23:56 UTC
[4/4] incubator-geode git commit: GEODE-1571: minor naming change
GEODE-1571: minor naming change
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/6f6b78a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/6f6b78a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/6f6b78a2
Branch: refs/heads/feature/GEODE-1571
Commit: 6f6b78a212c1baee69a95d0432c4055eca8f8f4f
Parents: 14dd8dc
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Thu Jul 7 15:22:01 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Thu Jul 7 15:22:01 2016 -0700
----------------------------------------------------------------------
.../gemstone/gemfire/management/internal/ManagementAgent.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6f6b78a2/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java
index cbe8868..f2bcf3b 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java
@@ -203,7 +203,7 @@ public class ManagementAgent {
logger.debug(message);
}
}
- else if (isCustomAuthenticator()){
+ else if (isIntegratedSecurity()){
System.setProperty("spring.profiles.active", "pulse.authentication.gemfire");
}
@@ -448,7 +448,7 @@ public class ManagementAgent {
};
String shiroConfig = this.config.getShiroInit();
- if (! StringUtils.isBlank(shiroConfig) || isCustomAuthenticator()) {
+ if (! StringUtils.isBlank(shiroConfig) || isIntegratedSecurity()) {
shiroAuthenticator = new JMXShiroAuthenticator();
env.put(JMXConnectorServer.AUTHENTICATOR, shiroAuthenticator);
cs.addNotificationListener(shiroAuthenticator, null, cs.getAttributes());
@@ -508,7 +508,7 @@ public class ManagementAgent {
}
- private boolean isCustomAuthenticator() {
+ private boolean isIntegratedSecurity() {
String factoryName = config.getSecurityManager();
return factoryName != null && !factoryName.isEmpty();
}