[java-identity-provider COMMIT] /trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Mar 15 10:14:34 2013
New Revision: 4335

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4335&view=rev
Log:
Capture RunTimeExceptions from the FilterContext predicates and turn them into a AttributeFilteringException.  Some thought needs to be applied to this.

Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java?rev=4335&r1=4334&r2=4335&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java Fri Mar 15 10:14:34 2013
@@ -139,7 +139,13 @@
 
         log.debug("Checking if attribute filter policy '{}' is active", getId());
 
-        boolean isActive = activationCriteria.apply(filterContext);
+        boolean isActive;
+        try {
+            isActive = activationCriteria.apply(filterContext);
+        } catch (RuntimeException e) {
+            // TODO deal with this.
+            throw new AttributeFilteringException(e);
+        }
         if (isActive) {
             log.debug("Attribute filter policy '{}' is active for this request", getId());
         } else {