/*
- * 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.
*/
*/
public void resolveFromCached(ResolverAttribute attribute) {
+ if (this == attribute) { return; }
+
resolved = true;
setLifetime(attribute.getLifetime());
// 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