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

[noreply at shibboleth.net]

Author: lajoie
Date: Tue Aug  2 15:13:20 2011
New Revision: 3999

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=3999&view=rev
Log:
Fix up compile errors related to EvaluableCriterion throwing an exception
Bit more work on session api

Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseResolverPlugin.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationMethod.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/AuthenticationEvent.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/BasicSessionManager.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/IdPSession.java
    trunk/idp-metadata-api/src/main/java/net/shibboleth/idp/metadata/CompositeMetadataResolver.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/CheckMessageLifetime.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/CheckMessageReplay.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolver.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/relyingparty/AbstractSAMLProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/relyingparty/saml2/AbstractSAML2ProfileConfiguration.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/relyingparty/AbstractSAMLProfileConfigurationTest.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/relyingparty/saml2/AbstractSAML2ProfileConfigurationTest.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=3999&r1=3998&r2=3999&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 Tue Aug  2 15:13:20 2011
@@ -27,6 +27,7 @@
 import net.shibboleth.idp.attribute.Attribute;
 
 import org.opensaml.util.criteria.EvaluableCriterion;
+import org.opensaml.util.criteria.EvaluationException;
 import org.opensaml.util.criteria.StaticResponseEvaluableCriterion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -110,7 +111,14 @@
     public boolean isApplicable(final AttributeFilterContext filterContext) throws AttributeFilteringException {
         log.debug("Checking if attribute filter policy '{}' is active", getId());
 
-        Boolean isActive = activationCriteria.evaluate(filterContext);
+        Boolean isActive = Boolean.FALSE;
+        try {
+            isActive = activationCriteria.evaluate(filterContext);
+        } catch (EvaluationException e) {
+            throw new AttributeFilteringException("Error evaluating applicability criteria for filter policy "
+                    + getId(), e);
+        }
+
         if (isActive) {
             log.debug("Attribute filter policy '{}' is active", getId());
         } else {

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseResolverPlugin.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseResolverPlugin.java?rev=3999&r1=3998&r2=3999&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseResolverPlugin.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseResolverPlugin.java Tue Aug  2 15:13:20 2011
@@ -26,7 +26,10 @@
 
 import org.opensaml.util.collections.LazySet;
 import org.opensaml.util.criteria.EvaluableCriterion;
+import org.opensaml.util.criteria.EvaluationException;
 import org.opensaml.util.criteria.StaticResponseEvaluableCriterion;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Base class for all {@link ResolutionPlugIn}s.
@@ -35,6 +38,9 @@
  */
 @ThreadSafe
 public abstract class BaseResolverPlugin<ResolvedType> extends AbstractComponent {
+    
+    /** Class logger. */
+    private final Logger log = LoggerFactory.getLogger(BaseResolverPlugin.class);
 
     /** Whether an {@link AttributeResolutionContext} that occurred resolving attributes will be re-thrown. */
     private boolean propagateResolutionExceptions;
@@ -165,8 +171,12 @@
      * @return true if the current resolution context meets the requirements for this plugin, false if not
      */
     public boolean isApplicable(final AttributeResolutionContext resolutionContext) {

[... 699 lines stripped ...]