Repository: knox Updated Branches: refs/heads/master 5ee7942fb -> 74ce27e99
KNOX-524 removed setting of default cache as it interferes with overrides in config Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/74ce27e9 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/74ce27e9 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/74ce27e9 Branch: refs/heads/master Commit: 74ce27e9928bd528ad66ecb3c535eb70a7a3ae25 Parents: 5ee7942 Author: Sumit Gupta <su...@apache.org> Authored: Wed Apr 1 11:51:49 2015 -0400 Committer: Sumit Gupta <su...@apache.org> Committed: Wed Apr 1 11:51:49 2015 -0400 ---------------------------------------------------------------------- .../org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java | 5 ----- 1 file changed, 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/74ce27e9/gateway-provider-security-shiro/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-shiro/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java b/gateway-provider-security-shiro/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java index c484bd3..b18712d 100644 --- a/gateway-provider-security-shiro/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java +++ b/gateway-provider-security-shiro/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java @@ -48,7 +48,6 @@ import org.apache.shiro.authc.SimpleAuthenticationInfo; import org.apache.shiro.authc.credential.HashedCredentialsMatcher; import org.apache.shiro.authz.AuthorizationInfo; import org.apache.shiro.authz.SimpleAuthorizationInfo; -import org.apache.shiro.cache.MemoryConstrainedCacheManager; import org.apache.shiro.crypto.hash.DefaultHashService; import org.apache.shiro.crypto.hash.Hash; import org.apache.shiro.crypto.hash.HashRequest; @@ -156,10 +155,6 @@ public class KnoxLdapRealm extends JndiLdapRealm { public KnoxLdapRealm() { HashedCredentialsMatcher credentialsMatcher = new HashedCredentialsMatcher(HASHING_ALGORITHM); setCredentialsMatcher(credentialsMatcher); - setCacheManager(new MemoryConstrainedCacheManager()); - setCachingEnabled(true); - setAuthenticationCachingEnabled(true); - setAuthorizationCachingEnabled(true); } /**
