[java-identity-provider COMMIT] in /trunk: idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Sep 29 16:03:26 2014
New Revision: 6604

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6604&view=rev
Log:
Change SS update methods to return a boolean.

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

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/WriteProfileInterceptorResultToStorage.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/WriteProfileInterceptorResultToStorage.java?rev=6604&r1=6603&r2=6604&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/WriteProfileInterceptorResultToStorage.java (original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/WriteProfileInterceptorResultToStorage.java Mon Sep 29 16:03:26 2014
@@ -113,7 +113,7 @@
                 success = storageService.create(context, key, value, expiration);
                 if (!success) {
                     // The record already exists, so we need to overwrite via an update.
-                    success = storageService.update(context, key, value, expiration) != null;
+                    success = storageService.update(context, key, value, expiration);
                 }
             } while (!success && attempts-- > 0);
 

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=6604&r1=6603&r2=6604&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 Mon Sep 29 16:03:26 2014
@@ -251,9 +251,9 @@
         final AuthenticationFlowDescriptor flow = sessionManager.getAuthenticationFlowDescriptor(flowId);
         if (flow != null) {
             try {
-                if (sessionManager.getStorageService().updateExpiration(getId(), result.getAuthenticationFlowId(),
+                if (!sessionManager.getStorageService().updateExpiration(getId(), result.getAuthenticationFlowId(),
                         result.getLastActivityInstant() + flow.getInactivityTimeout()
-                            + AuthenticationFlowDescriptor.STORAGE_EXPIRATION_OFFSET) == null) {
+                            + AuthenticationFlowDescriptor.STORAGE_EXPIRATION_OFFSET)) {
                     log.warn("Skipping update, AuthenticationResult for flow {} in session {} not found in storage",
                             flowId, getId());
                 }
@@ -573,7 +573,7 @@
                     // The record already exists, so we need to overwrite via an update.
                     success = sessionManager.getStorageService().update(getId(), flowId, result, flow,
                             result.getLastActivityInstant() + flow.getInactivityTimeout()
-                                + AuthenticationFlowDescriptor.STORAGE_EXPIRATION_OFFSET) != null;
+                                + AuthenticationFlowDescriptor.STORAGE_EXPIRATION_OFFSET);
                 }
             } while (!success && attempts-- > 0);
             
@@ -673,7 +673,7 @@
                 if (!success) {
                     // The record already exists, so we need to overwrite via an update.
                     success = sessionManager.getStorageService().update(getId(), key, builder.toString(),
-                            session.getExpirationInstant() + sessionManager.getSessionSlop()) != null;
+                            session.getExpirationInstant() + sessionManager.getSessionSlop());
                 }
             } while (!success && attempts-- > 0);