throw exception on nonce create/retrieve errors

[pithos] / src / gr / ebs / gss / server / CacheFilter.java

diff --git a/src/gr/ebs/gss/server/CacheFilter.java b/src/gr/ebs/gss/server/CacheFilter.java
index 734c166..3831d8b 100644 (file)
--- a/src/gr/ebs/gss/server/CacheFilter.java
+++ b/src/gr/ebs/gss/server/CacheFilter.java
@@ -37,10 +37,12 @@ import javax.servlet.http.HttpServletResponse;
  *
  */
 public class CacheFilter implements Filter {
-       public void doFilter( ServletRequest request, ServletResponse response,
+       @Override
+       public void doFilter( ServletRequest request, ServletResponse response,
                        FilterChain filterChain) throws IOException, ServletException {
                HttpServletRequest httpRequest = (HttpServletRequest)request;
                String requestURI = httpRequest.getRequestURI();
+               String contextPath = httpRequest.getContextPath();
                if (requestURI.contains(".nocache.")) {
                        HttpServletResponse httpResponse = (HttpServletResponse)response;
                        httpResponse.setHeader("Expires", "Fri, 01 Jan 1990 00:00:00 GMT");
@@ -50,7 +52,11 @@ public class CacheFilter implements Filter {
                        long today = new Date().getTime();
                        HttpServletResponse httpResponse = (HttpServletResponse)response;
                        httpResponse.setDateHeader("Expires", today+31536000000L);
-               } else {
+               } else if (!requestURI.startsWith(contextPath + "/nonce") &&
+                                       !requestURI.startsWith(contextPath + "/token") &&
+                                       !requestURI.startsWith(contextPath + "/login") &&
+                                       !requestURI.startsWith(contextPath + "/rest") &&
+                                       !requestURI.startsWith(contextPath + "/policy")) {
                        long today = new Date().getTime();
                        HttpServletResponse httpResponse = (HttpServletResponse)response;
                        httpResponse.setDateHeader("Expires", today+3456000000L);