You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@shiro.apache.org by lh...@apache.org on 2011/01/17 23:27:20 UTC

svn commit: r1060114 - /shiro/trunk/core/src/main/java/org/apache/shiro/config/IniSecurityManagerFactory.java

Author: lhazlewood
Date: Mon Jan 17 22:27:20 2011
New Revision: 1060114

URL: http://svn.apache.org/viewvc?rev=1060114&view=rev
Log:
SHIRO-238: implemented proposed fix

Modified:
    shiro/trunk/core/src/main/java/org/apache/shiro/config/IniSecurityManagerFactory.java

Modified: shiro/trunk/core/src/main/java/org/apache/shiro/config/IniSecurityManagerFactory.java
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/main/java/org/apache/shiro/config/IniSecurityManagerFactory.java?rev=1060114&r1=1060113&r2=1060114&view=diff
==============================================================================
--- shiro/trunk/core/src/main/java/org/apache/shiro/config/IniSecurityManagerFactory.java (original)
+++ shiro/trunk/core/src/main/java/org/apache/shiro/config/IniSecurityManagerFactory.java Mon Jan 17 22:27:20 2011
@@ -173,7 +173,8 @@ public class IniSecurityManagerFactory e
     private void addToRealms(Collection<Realm> realms, RealmFactory factory) {
         LifecycleUtils.init(factory);
         Collection<Realm> factoryRealms = factory.getRealms();
-        if (!CollectionUtils.isEmpty(realms)) {
+        //SHIRO-238: check factoryRealms (was 'realms'):
+        if (!CollectionUtils.isEmpty(factoryRealms)) {
             realms.addAll(factoryRealms);
         }
     }