Refactoring hasAnyRoles method

timperrett · Sep 22, 2011 · 95ccd4a · 95ccd4a
1 parent 6c52e5f
commit 95ccd4a
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/library/src/main/scala/shiro/utils.scala b/library/src/main/scala/shiro/utils.scala
@@ -36,10 +36,8 @@ private[shiro] trait Utils {
   def lacksPermission(permission: String) = 
     !hasPermission(permission)
 
-  def hasAnyRoles(roles: Seq[String]) = test { subject =>
-    roles.map(r => subject.hasRole(r.trim)
-      ).contains(true)
-  }
+  def hasAnyRoles(roles: Seq[String]) = 
+    roles exists (r => hasRole(r.trim))
 }
 
 import net.liftweb.common.{Box,Failure,Full}