Fixed a bug that was causing attribute caching to fail under certain circumstances...

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1845 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/edu/internet2/middleware/shibboleth/aa/AAAttribute.java b/src/edu/internet2/middleware/shibboleth/aa/AAAttribute.java
index 695e464..505f43a 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/aa/AAAttribute.java
+++ b/src/edu/internet2/middleware/shibboleth/aa/AAAttribute.java
@@ -1,16 +1,9 @@
 /*
- * Copyright [2005] [University Corporation for Advanced Internet Development, Inc.]
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * Copyright [2005] [University Corporation for Advanced Internet Development, Inc.] Licensed under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in
+ * writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
@@ -150,6 +143,8 @@ public class AAAttribute extends SAMLAttribute implements ResolverAttribute, Arp
         */
        public void resolveFromCached(ResolverAttribute attribute) {
 
+               if (this == attribute) { return; }
+
                resolved = true;
                setLifetime(attribute.getLifetime());
 

diff --git a/src/edu/internet2/middleware/shibboleth/aa/attrresolv/AttributeResolver.java b/src/edu/internet2/middleware/shibboleth/aa/attrresolv/AttributeResolver.java
index f6567d5..b6c67f7 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/aa/attrresolv/AttributeResolver.java
+++ b/src/edu/internet2/middleware/shibboleth/aa/attrresolv/AttributeResolver.java
@@ -449,10 +449,9 @@ public class AttributeResolver {
                // Check to see if we have already resolved the attribute during this request
                // (this checks attributes that were submitted to the AR for resolution)
                ResolverAttribute requestedAttribute = requestedAttributes.getByName(currentDefinition.getId());
-               if (requestedAttribute != null) {
-                       if (requestedAttribute.resolved()) {
+               if (requestedAttribute != null && requestedAttribute.resolved()) {
                                attribute.resolveFromCached(requestedAttribute);
-                       }
+                               return;
                }
 
                // Check to see if we have a cached resolution for this attribute