[java-identity-provider COMMIT] in /trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl:...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Dec 19 10:16:33 2014
New Revision: 7175

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7175&view=rev
Log:
Better Javadoc

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML1AttributeDesignatorsMapperService.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML2AttributesMapperService.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML1AttributeDesignatorsMapperService.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML1AttributeDesignatorsMapperService.java?rev=7175&r1=7174&r2=7175&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML1AttributeDesignatorsMapperService.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML1AttributeDesignatorsMapperService.java Fri Dec 19 10:16:33 2014
@@ -53,8 +53,9 @@
     /** Service used to get the resolver used to fetch attributes. */
     @Nonnull private final ReloadableService<AttributeResolver> attributeResolverService;
 
-    /** Whether the last invocation of {@link #refreshMappers()} failed. */
-    @Nonnull private boolean refreshFailed;
+    /** Whether the last invocation of {@link ReloadableService#reload()}
+     * on {@link #attributeResolverService} failed. This limits the noise in log file. */
+    @Nonnull private boolean captiveServiceReloadFailed;
 
     /** Cached AttributeMapper. */
     @Nullable private SAML1AttributeDesignatorsMapper attributesMapper;
@@ -105,14 +106,14 @@
             final DateTime when = attributeResolverService.getLastSuccessfulReloadInstant();
             component = attributeResolverService.getServiceableComponent();
             if (null == component) {
-                if (!refreshFailed) {
+                if (!captiveServiceReloadFailed) {
                     log.error("Invalid AttributeResolver configuration");
                 }
-                refreshFailed = true;
+                captiveServiceReloadFailed = true;
             } else {
                 final AttributeResolver attributeResolver = component.getComponent();
                 am = new SAML1AttributeDesignatorsMapper(attributeResolver);
-                refreshFailed = false;
+                captiveServiceReloadFailed = false;
                 lastReload = when;
             }
         } finally {

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML2AttributesMapperService.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML2AttributesMapperService.java?rev=7175&r1=7174&r2=7175&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML2AttributesMapperService.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML2AttributesMapperService.java Fri Dec 19 10:16:33 2014
@@ -53,9 +53,9 @@
     /** Service used to get the resolver used to fetch attributes. */
     @Nonnull private final ReloadableService<AttributeResolver> attributeResolverService;
 
-    /** Whether the last invocation of {@link ReloadableService#reload()} failed 
-     * on {@link #attributeResolverService}. */
-    @Nonnull private boolean refreshFailed;
+    /** Whether the last invocation of {@link ReloadableService#reload()}
+     * on {@link #attributeResolverService} failed. This limits the noise in log file. */
+    @Nonnull private boolean captiveServiceReloadFailed;
 
     /** Cached AttributeMapper. */
     @Nullable private SAML2AttributesMapper attributesMapper;
@@ -105,14 +105,14 @@
             final DateTime when = attributeResolverService.getLastSuccessfulReloadInstant();
             component = attributeResolverService.getServiceableComponent();
             if (null == component) {
-                if (!refreshFailed) {
+                if (!captiveServiceReloadFailed) {
                     log.error("Invalid AttributeResolver configuration");
                 }
-                refreshFailed = true;
+                captiveServiceReloadFailed = true;
             } else {
                 final AttributeResolver attributeResolver = component.getComponent();
                 am = new SAML2AttributesMapper(attributeResolver);
-                refreshFailed = false;
+                captiveServiceReloadFailed = false;
                 lastReload = when;
             }
         } finally {