[java-identity-provider COMMIT] /trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadingRel...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Jul 18 23:06:14 2014
New Revision: 6311

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6311&view=rev
Log:
Fix log messages.

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadingRelyingPartyMetadataProvider.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadingRelyingPartyMetadataProvider.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadingRelyingPartyMetadataProvider.java?rev=6311&r1=6310&r2=6311&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadingRelyingPartyMetadataProvider.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadingRelyingPartyMetadataProvider.java Fri Jul 18 23:06:14 2014
@@ -55,7 +55,7 @@
      * @param resolverService the service which will manage the loading.
      */
     public ReloadingRelyingPartyMetadataProvider(@Nonnull ReloadableService<MetadataResolver> resolverService) {
-        service = Constraint.isNotNull(resolverService, "RelyingParty Service cannot be null");
+        service = Constraint.isNotNull(resolverService, "MetadataResolver Service cannot be null");
     }
 
     /** {@inheritDoc} */
@@ -66,13 +66,14 @@
         try {
             component = service.getServiceableComponent();
             if (null == component) {
-                log.error("RelyingPartyResolver '{}': error looking up Relying Party: Invalid configuration.", getId());
+                log.error("RelyingPartyMetadataProvider '{}': Error accessing underlying metadata source: "
+                        + "Invalid configuration.", getId());
             } else {
                 final MetadataResolver resolver = component.getComponent();
                 return resolver.resolve(criteria);
             }
-        } catch (ResolverException e) {
-            log.error("RelyingPartyResolver '{}': error in resolution", getId(), e);
+        } catch (final ResolverException e) {
+            log.error("RelyingPartyMetadataProvider '{}': Error during resolution", getId(), e);
         } finally {
             if (null != component) {
                 component.unpinComponent();
@@ -89,13 +90,14 @@
         try {
             component = service.getServiceableComponent();
             if (null == component) {
-                log.error("RelyingPartyResolver '{}': error looking up Relying Party: Invalid configuration.", getId());
+                log.error("RelyingPartyMetadataProvider '{}': Error accessing underlying metadata source: "
+                        + "Invalid configuration.", getId());
             } else {
                 final MetadataResolver resolver = component.getComponent();
                 return resolver.resolveSingle(criteria);
             }
-        } catch (ResolverException e) {
-            log.error("RelyingPartyResolver '{}': error in resolution", getId(), e);
+        } catch (final ResolverException e) {
+            log.error("RelyingPartyResolver '{}': Error during resolution", getId(), e);
         } finally {
             if (null != component) {
                 component.unpinComponent();
@@ -111,7 +113,8 @@
         try {
             component = service.getServiceableComponent();
             if (null == component) {
-                log.error("RelyingPartyResolver '{}': error looking up Relying Party: Invalid configuration.", getId());
+                log.error("RelyingPartyMetadataProvider '{}': Error accessing underlying metadata source: "
+                        + "Invalid configuration.", getId());
             } else {
                 final MetadataResolver resolver = component.getComponent();
                 return resolver.isRequireValidMetadata();
@@ -136,7 +139,8 @@
         try {
             component = service.getServiceableComponent();
             if (null == component) {
-                log.error("RelyingPartyResolver '{}': error looking up Relying Party: Invalid configuration.", getId());
+                log.error("RelyingPartyMetadataProvider '{}': Error accessing underlying metadata source: "
+                        + "Invalid configuration.", getId());
             } else {
                 final MetadataResolver resolver = component.getComponent();
                 return resolver.getMetadataFilter();
@@ -153,4 +157,5 @@
     @Override public void setMetadataFilter(MetadataFilter newFilter) {
         throw new IllegalAccessError("Cannot set Metadata filter");
     }
-}
+    
+}