[java-identity-provider COMMIT] /trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedId...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Jun 20 19:12:24 2014
New Revision: 6133

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6133&view=rev
Log:
Tone down log message.

Modified:
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedIdPSession.java

Modified: trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedIdPSession.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedIdPSession.java?rev=6133&r1=6132&r2=6133&view=diff
==============================================================================
--- trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedIdPSession.java (original)
+++ trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedIdPSession.java Fri Jun 20 19:12:24 2014
@@ -86,14 +86,14 @@
     @Override
     public void setLastActivityInstant(@Duration @Positive final long instant) throws SessionException {
         
-        long exp = instant + sessionManager.getSessionTimeout() + sessionManager.getSessionSlop();
+        final long exp = instant + sessionManager.getSessionTimeout() + sessionManager.getSessionSlop();
         log.debug("Updating expiration of master record for session {} to {}", getId(), new DateTime(exp));
         
         try {
             sessionManager.getStorageService().updateExpiration(
                     getId(), StorageBackedSessionManager.SESSION_MASTER_KEY, exp);
             super.setLastActivityInstant(instant);
-        } catch (IOException e) {
+        } catch (final IOException e) {
             log.error("Exception updating expiration of master record for session " + getId(), e);
             if (!sessionManager.isMaskStorageFailure()) {
                 throw new SessionException("Exception updating expiration of session record", e);
@@ -121,7 +121,7 @@
             boolean success = writeToStorage();
             while (!success && attempts-- > 0) {
                 // The record may have changed underneath, so we need to re-check the address.
-                String nowBound = getAddress(getAddressFamily(address));
+                final String nowBound = getAddress(getAddressFamily(address));
                 if (nowBound != null) {
                     // The same address type is now set, so recheck. No need to update storage regardless.
                     if (nowBound.equals(address)) {
@@ -139,7 +139,7 @@
             if (!success) {
                 log.error("Exhausted retry attempts updating record for session {}", getId());
             }
-        } catch (IOException e) {
+        } catch (final IOException e) {
             log.error("Exception updating address binding of master record for session " + getId(), e);
             if (!sessionManager.isMaskStorageFailure()) {
                 throw new SessionException("Exception updating address binding of session record", e);
@@ -152,13 +152,13 @@
     @Nonnull @NonnullElements @NotLive @Unmodifiable public Set<AuthenticationResult> getAuthenticationResults() {
         
         // Check for any sparse/null values in the map, which need to be loaded before returning a complete set.
-        Iterator<Map.Entry<String, Optional<AuthenticationResult>>> entries =
+        final Iterator<Map.Entry<String, Optional<AuthenticationResult>>> entries =
                 getAuthenticationResultMap().entrySet().iterator();
         while (entries.hasNext()) {
-            Map.Entry<String, Optional<AuthenticationResult>> entry = entries.next();
+            final Map.Entry<String, Optional<AuthenticationResult>> entry = entries.next();
             if (!entry.getValue().isPresent()) {
                 try {
-                    AuthenticationResult result = loadAuthenticationResultFromStorage(entry.getKey());
+                    final AuthenticationResult result = loadAuthenticationResultFromStorage(entry.getKey());
                     if (result != null) {
                         entry.setValue(Optional.of(result));
                     } else {
@@ -166,7 +166,7 @@
                         entries.remove();
                     }
                 // Checkstyle: EmptyBlock OFF - exception's logged in load function
-                } catch (IOException e) {
+                } catch (final IOException e) {
                     // An exception implies the record *might* still be accessible later.
                 }
                 // Checkstyle: EmptyBlock ON
@@ -201,7 +201,7 @@
                 getAuthenticationResultMap().remove(trimmed);
             }
         // Checkstyle: EmptyBlock OFF - exception's logged in load function
-        } catch (IOException e) {
+        } catch (final IOException e) {
             // An exception implies the record *might* still be accessible later.
         }
         // Chckstyle: EmptyBlock ON
@@ -219,7 +219,7 @@
             if (!saveAuthenticationResultToStorage(result) && !sessionManager.isMaskStorageFailure()) {

[... 280 lines stripped ...]