You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2011/10/09 12:44:29 UTC
svn commit: r1180580 - in /wicket/trunk/wicket-core/src:
main/java/org/apache/wicket/request/handler/
test/java/org/apache/wicket/request/handler/
Author: mgrigorov
Date: Sun Oct 9 10:44:28 2011
New Revision: 1180580
URL: http://svn.apache.org/viewvc?rev=1180580&view=rev
Log:
WICKET-4116 Ajax link reports wield error when session is expired
Cache the 'isNewInstance' value for a PageProvider.
Ignore the call on RequestListenerInterface if the page is newly created and schedule re-paint of the whole page.
Added:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandlerTest.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/PageProvider.java
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java?rev=1180580&r1=1180579&r2=1180580&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java Sun Oct 9 10:44:28 2011
@@ -26,6 +26,8 @@ import org.apache.wicket.request.handler
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.Args;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Request handler that invokes the listener interface on component and renders page afterwards.
@@ -37,6 +39,9 @@ public class ListenerInterfaceRequestHan
IPageRequestHandler,
IComponentRequestHandler
{
+
+ private static final Logger LOG = LoggerFactory.getLogger(ListenerInterfaceRequestHandler.class);
+
private final IPageAndComponentProvider pageComponentProvider;
private final RequestListenerInterface listenerInterface;
@@ -146,19 +151,42 @@ public class ListenerInterfaceRequestHan
*/
public void respond(final IRequestCycle requestCycle)
{
+ final boolean isNewPageInstance = pageComponentProvider.isNewPageInstance();
+ final boolean isAjax = ((WebRequest)requestCycle.getRequest()).isAjax();
final IRequestablePage page = getPage();
+ final boolean isStateless = page.isPageStateless();
+ final IPageProvider pageProvider = new PageProvider(page);
+
if (getComponent().getPage() == page)
{
- boolean isAjax = ((WebRequest)requestCycle.getRequest()).isAjax();
+ RedirectPolicy policy = isStateless ? RedirectPolicy.NEVER_REDIRECT
+ : RedirectPolicy.AUTO_REDIRECT;
+
+ if (isNewPageInstance)
+ {
+ if (LOG.isDebugEnabled())
+ {
+ LOG.debug(
+ "A ListenerInterface '{}' assigned to '{}' is executed on an expired page. "
+ + "Scheduling re-create of the page and ignoring the listener interface...",
+ listenerInterface, getComponentPath());
+ }
+
+ if (isAjax)
+ {
+ policy = RedirectPolicy.ALWAYS_REDIRECT;
+ }
+
+ requestCycle.scheduleRequestHandlerAfterCurrent(new RenderPageRequestHandler(
+ pageProvider, policy));
+ return;
+ }
+
if (isAjax == false && listenerInterface.isRenderPageAfterInvocation())
{
// schedule page render after current request handler is done. this can be
// overridden during invocation of listener
// method (i.e. by calling RequestCycle#setResponsePage)
- final IPageProvider pageProvider = new PageProvider(page);
- final RedirectPolicy policy = page.isPageStateless()
- ? RedirectPolicy.NEVER_REDIRECT : RedirectPolicy.AUTO_REDIRECT;
-
requestCycle.scheduleRequestHandlerAfterCurrent(new RenderPageRequestHandler(
pageProvider, policy));
}
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/PageProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/PageProvider.java?rev=1180580&r1=1180579&r2=1180580&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/PageProvider.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/PageProvider.java Sun Oct 9 10:44:28 2011
@@ -59,6 +59,8 @@ public class PageProvider implements IPa
private PageParameters pageParameters;
+ private Boolean isNewInstance = null;
+
/**
* Creates a new page provider object. Upon calling of {@link #getPageInstance()} this provider
* will return page instance with specified id.
@@ -198,17 +200,20 @@ public class PageProvider implements IPa
*/
public boolean isNewPageInstance()
{
- boolean isNew = pageInstance == null;
- if (isNew && pageId != null)
+ if (isNewInstance == null)
{
- IRequestablePage storedPageInstance = getStoredPage(pageId);
- if (storedPageInstance != null)
+ isNewInstance = pageInstance == null;
+ if (isNewInstance && pageId != null)
{
- pageInstance = storedPageInstance;
- isNew = false;
+ IRequestablePage storedPageInstance = getStoredPage(pageId);
+ if (storedPageInstance != null)
+ {
+ pageInstance = storedPageInstance;
+ isNewInstance = false;
+ }
}
}
- return isNew;
+ return isNewInstance;
}
/**
@@ -292,6 +297,14 @@ public class PageProvider implements IPa
(pageClass == null || pageClass.equals(storedPageInstance.getClass())))
{
pageInstance = storedPageInstance;
+
+ if (pageInstance != null)
+ {
+ if (renderCount != null && pageInstance.getRenderCount() != renderCount)
+ {
+ throw new StalePageException(pageInstance);
+ }
+ }
}
return storedPageInstance;
}
Added: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandlerTest.java?rev=1180580&view=auto
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandlerTest.java (added)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandlerTest.java Sun Oct 9 10:44:28 2011
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.request.handler;
+
+import java.io.IOException;
+import java.text.ParseException;
+
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.Page;
+import org.apache.wicket.Session;
+import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.IMarkupResourceStreamProvider;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.util.resource.IResourceStream;
+import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
+import org.apache.wicket.util.resource.StringResourceStream;
+import org.junit.Test;
+
+/**
+ * Tests for {@link ListenerInterfaceRequestHandler}
+ */
+public class ListenerInterfaceRequestHandlerTest extends WicketTestCase
+{
+
+ /**
+ * https://issues.apache.org/jira/browse/WICKET-4116
+ *
+ * @throws Exception
+ */
+ @Test
+ public void recreateThePageWhenListenereInterfaceIsExecutedOnExpiredPage() throws Exception
+ {
+ tester.getApplication().mountPage("ajaxLink", AjaxLinkExpirePage.class);
+ AjaxLinkExpirePage page = tester.startPage(AjaxLinkExpirePage.class);
+
+ int initialPageId = page.getPageId();
+
+ Url urlToAjaxLink = tester.urlFor(page.link);
+ Session session = tester.getSession();
+ session.getPageManager().sessionExpired(session.getId());
+
+ // fire a request to the ajax link on the expired page
+ executeAjaxUrlWithLastBaseUrl(urlToAjaxLink);
+
+ Page lastRenderedPage = tester.getLastRenderedPage();
+ int lastRenderedPageId = lastRenderedPage.getPageId();
+ assertTrue("A new page must be create ", lastRenderedPageId > initialPageId);
+ }
+
+ private void executeAjaxUrlWithLastBaseUrl(Url url) throws IOException,
+ ResourceStreamNotFoundException, ParseException
+ {
+ tester.getRequest().setUrl(url);
+ tester.getRequest().addHeader("Wicket-Ajax-BaseURL",
+ tester.getWicketAjaxBaseUrlEncodedInLastResponse());
+ tester.getRequest().addHeader("Wicket-Ajax", "true");
+ tester.processRequest();
+ }
+
+ /**
+ * Test page for #recreateThePageWhenListenereInterfaceIsExecutedOnExpiredPage()
+ */
+ public static class AjaxLinkExpirePage extends WebPage implements IMarkupResourceStreamProvider
+ {
+ private static final long serialVersionUID = 1L;
+
+ private AjaxLink<Void> link;
+
+ /**
+ * Constructor.
+ */
+ public AjaxLinkExpirePage()
+ {
+ add(link = new AjaxLink<Void>("test")
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target)
+ {
+ System.err.println("clicked");
+ }
+ });
+ }
+
+ public IResourceStream getMarkupResourceStream(MarkupContainer container,
+ Class<?> containerClass)
+ {
+
+ return new StringResourceStream(
+ "<html><body><a wicket:id='test'>Link</a></body></html>");
+ }
+
+ }
+}