[utilities COMMIT] in /spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource: FileBackedHTTPResour...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Oct 10 06:56:47 2014
New Revision: 670

URL: http://svn.shibboleth.net/view/utilities?rev=670&view=rev
Log:
JSE-9 Review logs.

Modified:
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResource.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/HTTPResource.java

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResource.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResource.java?rev=670&r1=669&r2=670&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResource.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResource.java Fri Oct 10 06:56:47 2014
@@ -128,7 +128,7 @@
     /** {@inheritDoc} */
     @Override public boolean exists() {
 
-        log.debug("{}: Attempting to fetch metadata", getDescription());
+        log.debug("{}: Attempting to fetch HTTP resource", getDescription());
         final HttpResponse response;
         try {
             response = getResourceHeaders();

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/HTTPResource.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/HTTPResource.java?rev=670&r1=669&r2=670&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/HTTPResource.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/HTTPResource.java Fri Oct 10 06:56:47 2014
@@ -141,7 +141,7 @@
                         + "after validating the entry with the origin server");
                 break;
             default:
-                log.info("Unknown status back {}", responseStatus.toString());
+                log.info("Unknown status {}", responseStatus.toString());
                 break;
         }
     }
@@ -152,14 +152,14 @@
         final HttpCacheContext context = buildHttpClientContext();
         HttpResponse response = null;
 
-        log.debug("Attempting to get data from '{}'", resourceURL);
+        log.debug("Attempting to get data from remote resource '{}'", resourceURL);
         response = httpClient.execute(httpGet, context);
         reportCachingStatus(context);
         int httpStatusCode = response.getStatusLine().getStatusCode();
 
         if (httpStatusCode != HttpStatus.SC_OK) {
             String errMsg =
-                    "Non-ok status code " + httpStatusCode + " returned from remote source " + resourceURL;
+                    "Non-ok status code " + httpStatusCode + " returned from remote resource " + resourceURL;
             log.error(errMsg);
             throw new IOException(errMsg);
         }
@@ -180,7 +180,7 @@
     /** {@inheritDoc} */
     @Override public boolean exists() {
 
-        log.debug("Attempting to fetch resource as '{}'", resourceURL);
+        log.debug("Attempting to fetch remote resource as '{}'", resourceURL);
         final HttpResponse response;
         try {
             response = getResourceHeaders();
@@ -240,7 +240,7 @@
             EntityUtils.consume(httpResponse.getEntity());
             return httpResponse;
         } catch (IOException e) {
-            throw new IOException("Error contacting resource " + resourceURL.toString(), e);
+            throw new IOException("Error contacting remote resource " + resourceURL.toString(), e);
         }
     }
 
@@ -254,13 +254,13 @@
     @Nullable protected String getResponseHeader(String what) throws IOException {
         final HttpResponse response;
 
-        log.debug("Attempting to fetch resource as '{}'", resourceURL);
+        log.debug("Attempting to fetch remote resource as '{}'", resourceURL);
         response = getResourceHeaders();
         int httpStatusCode = response.getStatusLine().getStatusCode();
 
         if (httpStatusCode != HttpStatus.SC_OK) {
             final String errMsg =
-                    "Non-ok status code " + httpStatusCode + " returned from remote source " + resourceURL;
+                    "Non-ok status code " + httpStatusCode + " returned from remote resource " + resourceURL;
             log.error(errMsg);
             throw new IOException(errMsg);
         }
@@ -279,7 +279,8 @@
         if (null != response) {
             return Long.parseLong(response);
         }
-        final String errMsg = "Response from " + resourceURL.toString() + " did not contain a Content-Length header";
+        final String errMsg = "Response from remote resource " + resourceURL.toString() + 
+                " did not contain a Content-Length header";
         log.error(errMsg);
         throw new IOException(errMsg);
     }

[... 11 lines stripped ...]