[java-identity-provider COMMIT] in /trunk: idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDes...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Sep 29 15:38:32 2014
New Revision: 6603

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6603&view=rev
Log:
Convert storage service version to a long.

Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializer.java
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/AbstractSPSessionSerializer.java
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedIdPSession.java
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedIdPSessionSerializer.java

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java?rev=6603&r1=6602&r2=6603&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java Mon Sep 29 15:38:32 2014
@@ -299,7 +299,7 @@
     }
 
     /** {@inheritDoc} */
-    @Override @Nonnull public AuthenticationResult deserialize(int version, @Nonnull @NotEmpty final String context,
+    @Override @Nonnull public AuthenticationResult deserialize(long version, @Nonnull @NotEmpty final String context,
             @Nonnull @NotEmpty final String key, @Nonnull @NotEmpty final String value, @Nonnull final Long expiration)
             throws IOException {
         ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializer.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializer.java?rev=6603&r1=6602&r2=6603&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializer.java (original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializer.java Mon Sep 29 15:38:32 2014
@@ -183,7 +183,7 @@
 // Checkstyle: CyclomaticComplexity OFF    
     /** {@inheritDoc} */
     @Override
-    @Nonnull public AuthenticationResult deserialize(final int version, @Nonnull @NotEmpty final String context,
+    @Nonnull public AuthenticationResult deserialize(final long version, @Nonnull @NotEmpty final String context,
                     @Nonnull @NotEmpty final String key, @Nonnull @NotEmpty final String value,
                     @Nullable final Long expiration) throws IOException {
         ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);

Modified: trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/AbstractSPSessionSerializer.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/AbstractSPSessionSerializer.java?rev=6603&r1=6602&r2=6603&view=diff
==============================================================================
--- trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/AbstractSPSessionSerializer.java (original)
+++ trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/AbstractSPSessionSerializer.java Mon Sep 29 15:38:32 2014
@@ -93,7 +93,7 @@
 
     /** {@inheritDoc} */
     @Override
-    @Nonnull public SPSession deserialize(final int version, @Nonnull @NotEmpty final String context,
+    @Nonnull public SPSession deserialize(final long version, @Nonnull @NotEmpty final String context,
             @Nonnull @NotEmpty final String key, @Nonnull @NotEmpty final String value, @Nullable final Long expiration)
                     throws IOException {
         

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=6603&r1=6602&r2=6603&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 15:38:32 2014
@@ -62,7 +62,7 @@
     @Nonnull private final StorageBackedSessionManager sessionManager;
     
     /** Storage version used to synchronize changes. */
-    private int version;
+    private long version;
     
     /**
      * Constructor.
@@ -484,7 +484,7 @@
      * 
      * @return current version of the storage record
      */

[... 39 lines stripped ...]