[seam-commits] Seam SVN: r9815 - trunk/src/wicket/org/jboss/seam/wicket/web.
Author: cpopetz
Date: 2008-12-22 11:16:34 -0500 (Mon, 22 Dec 2008)
New Revision: 9815
Modified:
trunk/src/wicket/org/jboss/seam/wicket/web/WicketRedirectFilter.java
Log:
JBSEAM-3679: WicketRedirectFilter should only be active on wicket requests
Modified: trunk/src/wicket/org/jboss/seam/wicket/web/WicketRedirectFilter.java
===================================================================
--- trunk/src/wicket/org/jboss/seam/wicket/web/WicketRedirectFilter.java 2008-12-22
16:14:50 UTC (rev 9814)
+++ trunk/src/wicket/org/jboss/seam/wicket/web/WicketRedirectFilter.java 2008-12-22
16:16:34 UTC (rev 9815)
@@ -2,7 +2,6 @@
import static org.jboss.seam.ScopeType.APPLICATION;
import static org.jboss.seam.annotations.Install.FRAMEWORK;
-import static org.jboss.seam.core.Manager.REDIRECT_FROM_MANAGER;
import java.io.IOException;
@@ -13,6 +12,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
+import org.apache.wicket.Application;
import org.jboss.seam.annotations.Install;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
@@ -29,7 +29,7 @@
* @author
*/
@Scope(APPLICATION)
-(a)Name("org.jboss.seam.web.redirectFilter")
+(a)Name("org.jboss.seam.wicket.web.redirectFilter")
@Install(precedence = FRAMEWORK,
classDependencies="org.apache.wicket.Application")
@BypassInterceptors
@Filter
@@ -49,7 +49,7 @@
@Override
public void sendRedirect(String url) throws IOException
{
- if ( Contexts.isEventContextActive() &&
!Contexts.getEventContext().isSet(REDIRECT_FROM_MANAGER) )
+ if ( Application.exists() && Contexts.isEventContextActive())
{
if ( Contexts.isConversationContextActive() )
{