[java-opensaml COMMIT] /trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/ClientStorageServi...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Aug 24 16:14:24 2015
New Revision: 4331

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4331&view=rev
Log:
Mark storage state dirty when data load fails.

Modified:
    trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/ClientStorageService.java

Modified: trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/ClientStorageService.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/ClientStorageService.java?rev=4331&r1=4330&r2=4331&view=diff
==============================================================================
--- trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/ClientStorageService.java	(original)
+++ trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/ClientStorageService.java	Mon Aug 24 16:14:24 2015
@@ -329,17 +329,20 @@
                 log.debug("{} Successfully decrypted and loaded storage state from client", getLogPrefix());
             } catch (final DataExpiredException e) {
                 log.debug("{} Secured data or key has expired", getLogPrefix());
+                storageObject.setDirty(true);
             } catch (final DataSealerException e) {
                 log.error("{} Exception unwrapping secured data", getLogPrefix(), e);
+                storageObject.setDirty(true);
             } catch (final IOException e) {
                 log.error("{} Error while loading serialized storage data", getLogPrefix(), e);
+                storageObject.setDirty(true);
             }
         } else {
             log.trace("{} Initializing empty storage state into session", getLogPrefix());
         }
         
         // The object should be loaded, and marked "clean", or in the event of just about any failure
-        // it should be empty and marked "dirty" to force an overwrite of the corrupted data.
+        // it should be empty and marked "dirty" to force an overwrite of the expired or corrupted data.
         
         final Lock lock = getLock().writeLock();
         try {