[utilities COMMIT] /java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java

[noreply at shibboleth.net]

Author: scantor
Date: Thu Oct 10 18:08:57 2013
New Revision: 457

URL: http://svn.shibboleth.net/view/utilities?rev=457&view=rev
Log:
Handle empty context path for cookies.

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java?rev=457&r1=456&r2=457&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java Thu Oct 10 18:08:57 2013
@@ -145,7 +145,7 @@
      */
     @Nullable public void addCookie(@Nonnull @NotEmpty final String name, @Nonnull @NotEmpty final String value) {
         Cookie cookie = new Cookie(name, value);
-        cookie.setPath(cookiePath != null ? cookiePath : httpRequest.getContextPath());
+        cookie.setPath(cookiePath != null ? cookiePath : contextPathToCookiePath());
         if (cookieDomain != null) {
             cookie.setDomain(cookieDomain);
         }
@@ -162,7 +162,7 @@
      */
     @Nullable public void unsetCookie(@Nonnull @NotEmpty final String name) {
         Cookie cookie = new Cookie(name, null);
-        cookie.setPath(cookiePath != null ? cookiePath : httpRequest.getContextPath());
+        cookie.setPath(cookiePath != null ? cookiePath : contextPathToCookiePath());
         if (cookieDomain != null) {
             cookie.setDomain(cookieDomain);
         }
@@ -171,4 +171,14 @@
         
         httpResponse.addCookie(cookie);
     }
+    
+    /**
+     * Turn the servlet context path into an appropriate cookie path.
+     * 
+     * @return  the cookie path
+     */
+    @Nonnull @NotEmpty private String contextPathToCookiePath() {
+        return "".equals(httpRequest.getContextPath()) ? "/" : httpRequest.getContextPath();
+    }
+    
 }