[utilities COMMIT] /java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadable...

[noreply at shibboleth.net]

Author: scantor
Date: Sat Jan 31 21:02:51 2015
New Revision: 735

URL: http://svn.shibboleth.net/view/utilities?rev=735&view=rev
Log:
JSPT-51 - AbstractReloadableService hides reload failures

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java?rev=735&r1=734&r2=735&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java Sat Jan 31 21:02:51 2015
@@ -212,10 +212,7 @@
         super.doDestroy();
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     */
+    /** {@inheritDoc} */
     @Override public final void reload() {
 
         final DateTime now = new DateTime(ISOChronology.getInstanceUTC());
@@ -223,11 +220,11 @@
 
         try {
             doReload();
-
             lastSuccessfulReleaseIntant = now;
         } catch (final ServiceException e) {
             log.error("{} Reload for {} failed", getLogPrefix(), getId(), e);
             reloadFailureCause = e;
+            throw e;
         }
     }
 
@@ -261,7 +258,7 @@
      * @return "Service '<definitionID>' :"
      */
     @Nonnull @NotEmpty protected String getLogPrefix() {
-        // local cache of cached entry to allow unsynchronised clearing of per class cache.
+        // local cache of cached entry to allow unsynchronized clearing of per class cache.
         String prefix = logPrefix;
         if (null == prefix) {
             StringBuilder builder = new StringBuilder("Service '").append(getId()).append("':");
@@ -282,8 +279,13 @@
         @Override public void run() {
 
             if (shouldReload()) {
-                reload();
-            }
-        }
-    }
+                try {
+                    reload();
+                } catch (final ServiceException e) {
+                    
+                }
+            }
+        }
+    }
+    
 }