[java-opensaml COMMIT] in /trunk/opensaml-storage-impl/src: main/java/org/opensaml/storage/impl/client/SaveCookieBack...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Aug 24 13:53:33 2015
New Revision: 4329

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4329&view=rev
Log:
IDP-594 - Clean up client storage save context in final action.

Modified:
    trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/SaveCookieBackedClientStorageServices.java
    trunk/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/SaveCookieBackedClientStorageServicesTest.java

Modified: trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/SaveCookieBackedClientStorageServices.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/SaveCookieBackedClientStorageServices.java?rev=4329&r1=4328&r2=4329&view=diff
==============================================================================
--- trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/SaveCookieBackedClientStorageServices.java	(original)
+++ trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/SaveCookieBackedClientStorageServices.java	Mon Aug 24 13:53:33 2015
@@ -46,8 +46,11 @@
  * An action that performs any number of {@link ClientStorageOperation} instances sourced from
  * cookies by issuing the necessary Set-Cookie headers.
  * 
+ * <p>The {@link ClientStorageSaveContext} is also removed.</p>
+ * 
  * @event {@link EventIds#PROCEED_EVENT_ID}
  * @event {@link EventIds#INVALID_PROFILE_CTX}
+ * @post ProfileRequestContext.getSubcontext(ClientStorageSaveContext.class) == null
  * 
  * @param <InboundMessageType>
  * @param <OutboundMessageType>
@@ -106,6 +109,7 @@
         
         if (!clientStorageSaveCtx.isSourceRequired(ClientStorageSource.COOKIE)) {
             log.debug("{} No cookie operations required", getLogPrefix());
+            profileRequestContext.removeSubcontext(clientStorageSaveCtx);
             return false;
         }
         
@@ -135,6 +139,8 @@
                 storageService.getCookieManager().unsetCookie(operation.getStorageKey());
             }
         }
+        
+        profileRequestContext.removeSubcontext(clientStorageSaveCtx);
     }
 
 }

Modified: trunk/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/SaveCookieBackedClientStorageServicesTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/SaveCookieBackedClientStorageServicesTest.java?rev=4329&r1=4328&r2=4329&view=diff
==============================================================================
--- trunk/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/SaveCookieBackedClientStorageServicesTest.java	(original)
+++ trunk/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/SaveCookieBackedClientStorageServicesTest.java	Mon Aug 24 13:53:33 2015
@@ -85,6 +85,7 @@
         
         action.execute(prc);
         ActionTestingSupport.assertProceedEvent(prc);
+        Assert.assertNull(saveCtx.getParent());
         Assert.assertEquals(((MockHttpServletResponse) HttpServletRequestResponseContext.getResponse()).getCookies().length, 0);
     }
     
@@ -100,6 +101,7 @@
 
         action.execute(prc);
         ActionTestingSupport.assertProceedEvent(prc);
+        Assert.assertNull(saveCtx.getParent());
         
         final MockHttpServletResponse response = (MockHttpServletResponse) HttpServletRequestResponseContext.getResponse();
         Assert.assertEquals(response.getCookies().length, 1);