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/06/03 12:05:48 UTC
svn commit: r1130972 - in
/wicket/trunk/wicket-core/src/main/java/org/apache/wicket: ./
markup/html/pages/ request/handler/
Author: mgrigorov
Date: Fri Jun 3 10:05:47 2011
New Revision: 1130972
URL: http://svn.apache.org/viewvc?rev=1130972&view=rev
Log:
WICKET-3759 Touch the page only when it is just read from the page store
Touch a page only once after it has been read from the page store - this minimizes the calls to PageAccessSynchronizer#lockPage();
Make the redirect policy for error pages AUTO_REDIRECT - this way redirect_to_buffer strategy is used and the error page is not stored in the page stores at all.
Introduce a common page for errors - AbstractErrorPage - it provides all the common settings for error pages (e.g. #isErrorPage(), #isVersioned(), etc.)
Added:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AbstractErrorPage.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/DefaultExceptionMapper.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.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/DefaultExceptionMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/DefaultExceptionMapper.java?rev=1130972&r1=1130971&r2=1130972&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/DefaultExceptionMapper.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/DefaultExceptionMapper.java Fri Jun 3 10:05:47 2011
@@ -54,6 +54,12 @@ public class DefaultExceptionMapper impl
}
catch (RuntimeException e2)
{
+ if (logger.isDebugEnabled())
+ {
+ logger.error(
+ "An error occurred while handling a previous error: " + e2.getMessage(), e2);
+ }
+
// hmmm, we were already handling an exception! give up
logger.error("unexpected exception when handling another exception: " + e.getMessage(),
e);
@@ -144,7 +150,7 @@ public class DefaultExceptionMapper impl
if (isProcessingAjaxRequest())
{
- redirect = RenderPageRequestHandler.RedirectPolicy.ALWAYS_REDIRECT;
+ redirect = RenderPageRequestHandler.RedirectPolicy.AUTO_REDIRECT;
}
return new RenderPageRequestHandler(pageProvider, redirect);
Added: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AbstractErrorPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AbstractErrorPage.java?rev=1130972&view=auto
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AbstractErrorPage.java (added)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AbstractErrorPage.java Fri Jun 3 10:05:47 2011
@@ -0,0 +1,57 @@
+/*
+ * 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.markup.html.pages;
+
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+/**
+ * A parent page for all pages that are used to show an error to the user. Setups the common
+ * settings for an error page.
+ */
+public abstract class AbstractErrorPage extends WebPage
+{
+ private static final long serialVersionUID = 1L;
+
+ protected AbstractErrorPage()
+ {
+ super();
+ }
+
+ protected AbstractErrorPage(final IModel<?> model)
+ {
+ super(model);
+ }
+
+ protected AbstractErrorPage(final PageParameters parameters)
+ {
+ super(parameters);
+ }
+
+ @Override
+ public boolean isErrorPage()
+ {
+ return true;
+ }
+
+ @Override
+ public boolean isVersioned()
+ {
+ return false;
+ }
+}
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.java?rev=1130972&r1=1130971&r2=1130972&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.java Fri Jun 3 10:05:47 2011
@@ -18,7 +18,6 @@ package org.apache.wicket.markup.html.pa
import javax.servlet.http.HttpServletResponse;
-import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.http.WebResponse;
@@ -28,7 +27,7 @@ import org.apache.wicket.request.http.We
*
* @author Jonathan Locke
*/
-public class AccessDeniedPage extends WebPage
+public class AccessDeniedPage extends AbstractErrorPage
{
private static final long serialVersionUID = 1L;
@@ -51,21 +50,4 @@ public class AccessDeniedPage extends We
response.setStatus(HttpServletResponse.SC_FORBIDDEN);
}
- /**
- * @see org.apache.wicket.Component#isVersioned()
- */
- @Override
- public boolean isVersioned()
- {
- return false;
- }
-
- /**
- * @see org.apache.wicket.Page#isErrorPage()
- */
- @Override
- public boolean isErrorPage()
- {
- return true;
- }
}
\ No newline at end of file
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.java?rev=1130972&r1=1130971&r2=1130972&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.java Fri Jun 3 10:05:47 2011
@@ -26,7 +26,6 @@ import org.apache.wicket.WicketRuntimeEx
import org.apache.wicket.markup.MarkupException;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.basic.MultiLineLabel;
import org.apache.wicket.markup.html.debug.PageView;
@@ -40,7 +39,7 @@ import org.apache.wicket.util.string.App
*
* @author Jonathan Locke
*/
-public class ExceptionErrorPage extends WebPage
+public class ExceptionErrorPage extends AbstractErrorPage
{
private static final long serialVersionUID = 1L;
@@ -269,21 +268,4 @@ public class ExceptionErrorPage extends
return throwable;
}
- /**
- * @see org.apache.wicket.Page#isErrorPage()
- */
- @Override
- public boolean isErrorPage()
- {
- return true;
- }
-
- /**
- * @see org.apache.wicket.Component#isVersioned()
- */
- @Override
- public boolean isVersioned()
- {
- return false;
- }
}
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java?rev=1130972&r1=1130971&r2=1130972&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java Fri Jun 3 10:05:47 2011
@@ -18,7 +18,6 @@ package org.apache.wicket.markup.html.pa
import javax.servlet.http.HttpServletResponse;
-import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.http.WebResponse;
@@ -28,7 +27,7 @@ import org.apache.wicket.request.http.We
*
* @author Jonathan Locke
*/
-public class InternalErrorPage extends WebPage
+public class InternalErrorPage extends AbstractErrorPage
{
private static final long serialVersionUID = 1L;
@@ -50,22 +49,4 @@ public class InternalErrorPage extends W
WebResponse response = (WebResponse)RequestCycle.get().getResponse();
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
-
- /**
- * @see org.apache.wicket.Component#isVersioned()
- */
- @Override
- public boolean isVersioned()
- {
- return false;
- }
-
- /**
- * @see org.apache.wicket.Page#isErrorPage()
- */
- @Override
- public boolean isErrorPage()
- {
- return true;
- }
}
\ No newline at end of file
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java?rev=1130972&r1=1130971&r2=1130972&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java Fri Jun 3 10:05:47 2011
@@ -18,7 +18,6 @@ package org.apache.wicket.markup.html.pa
import javax.servlet.http.HttpServletResponse;
-import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.http.WebResponse;
@@ -28,7 +27,7 @@ import org.apache.wicket.request.http.We
*
* @author Jonathan Locke
*/
-public class PageExpiredErrorPage extends WebPage
+public class PageExpiredErrorPage extends AbstractErrorPage
{
private static final long serialVersionUID = 1L;
@@ -50,22 +49,4 @@ public class PageExpiredErrorPage extend
WebResponse response = (WebResponse)RequestCycle.get().getResponse();
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
}
-
- /**
- * @see org.apache.wicket.Component#isVersioned()
- */
- @Override
- public boolean isVersioned()
- {
- return false;
- }
-
- /**
- * @see org.apache.wicket.Page#isErrorPage()
- */
- @Override
- public boolean isErrorPage()
- {
- return true;
- }
}
\ No newline at end of file
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=1130972&r1=1130971&r2=1130972&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 Fri Jun 3 10:05:47 2011
@@ -158,12 +158,14 @@ public class PageProvider implements IPa
if (pageInstance == null)
{
pageInstance = getPageInstance(pageId, pageClass, pageParameters, renderCount);
+
+ if (pageInstance == null)
+ {
+ throw new PageExpiredException("Page expired.");
+ }
+
+ touchPageInstance(pageInstance);
}
- if (pageInstance == null)
- {
- throw new PageExpiredException("Page expired.");
- }
- touchPageInstance(pageInstance);
return pageInstance;
}