From 86514a31c10d69b6fd581b8902dd30d21602b727 Mon Sep 17 00:00:00 2001
From: Scott Battaglia <scott.battaglia@gmail.com>
Date: Sun, 13 Aug 2006 02:44:37 +0000
Subject: [PATCH] CASC-7 updated to put redirect within code that looks for
 ticket

---
 .../cas/client/web/filter/CasValidationFilter.java     | 10 +++++-----
 .../client/web/filter/CasValidationFilterTests.java    |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/CasValidationFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/CasValidationFilter.java
index 9dd968c..f386029 100644
--- a/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/CasValidationFilter.java
+++ b/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/CasValidationFilter.java
@@ -104,12 +104,12 @@ public final class CasValidationFilter extends AbstractCasFilter {
                 log.warn(e, e);
                 throw new ServletException(e);
             }
-        }
 
-        if (this.redirectAfterValidation) {
-            response.sendRedirect(response
-                    .encodeRedirectURL(constructServiceUrl(request, response)));
-            return;
+            if (this.redirectAfterValidation) {
+                response.sendRedirect(response
+                        .encodeRedirectURL(constructServiceUrl(request, response)));
+                return;
+            }
         }
 
         filterChain.doFilter(request, response);
diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/web/filter/CasValidationFilterTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/web/filter/CasValidationFilterTests.java
index a247cd8..952ddea 100644
--- a/cas-client-core/src/test/java/org/jasig/cas/client/web/filter/CasValidationFilterTests.java
+++ b/cas-client-core/src/test/java/org/jasig/cas/client/web/filter/CasValidationFilterTests.java
@@ -87,6 +87,7 @@ public final class CasValidationFilterTests extends TestCase {
         this.filter.doFilter(request, response, filterChain);
 
         assertNotNull(session.getAttribute(AbstractCasFilter.CONST_ASSERTION));
+        assertNull(response.getRedirectedUrl());
     }
 
     public void testValidationFailure() throws Exception {