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 2015/11/16 23:07:30 UTC
wicket git commit: WICKET-5998 Page is detached twice in same AJAX
request
Repository: wicket
Updated Branches:
refs/heads/WICKET-5998-page-is-detached-twice [created] d2bc4ad0c
WICKET-5998 Page is detached twice in same AJAX request
Move RequestHandlerStack to wicket-core to be able to track the detached IPageClassRequestHandler's
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d2bc4ad0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d2bc4ad0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d2bc4ad0
Branch: refs/heads/WICKET-5998-page-is-detached-twice
Commit: d2bc4ad0c45441b1437efd39271610b331db3bea
Parents: d2de2c0
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Nov 16 23:07:07 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Nov 16 23:07:07 2015 +0100
----------------------------------------------------------------------
.../apache/wicket/RequestListenerInterface.java | 2 +-
.../wicket/request/cycle/RequestCycle.java | 1 -
.../request/cycle/RequestHandlerStack.java | 225 +++++++++++++++++++
.../wicket/session/DefaultPageFactory.java | 2 +-
.../cycle/BaseRequestHandlerStackTest.java | 1 -
.../request/cycle/RequestHandlerStackTest.java | 1 -
.../wicket/request/RequestHandlerStack.java | 180 +--------------
7 files changed, 234 insertions(+), 178 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d2bc4ad0/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java b/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
index 0eeac52..e578263 100644
--- a/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
+++ b/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
@@ -25,9 +25,9 @@ import java.util.Map;
import org.apache.wicket.authorization.AuthorizationException;
import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.core.request.handler.ListenerInvocationNotAllowedException;
import org.apache.wicket.request.RequestHandlerStack.ReplaceHandlerException;
import org.apache.wicket.request.component.IRequestableComponent;
-import org.apache.wicket.core.request.handler.ListenerInvocationNotAllowedException;
import org.apache.wicket.util.lang.Classes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/wicket/blob/d2bc4ad0/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java b/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
index f0e4ff0..c00ca52 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
@@ -35,7 +35,6 @@ import org.apache.wicket.request.IRequestCycle;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.IRequestMapper;
import org.apache.wicket.request.Request;
-import org.apache.wicket.request.RequestHandlerStack;
import org.apache.wicket.request.Response;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.UrlRenderer;
http://git-wip-us.apache.org/repos/asf/wicket/blob/d2bc4ad0/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestHandlerStack.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestHandlerStack.java b/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestHandlerStack.java
new file mode 100644
index 0000000..22a5697
--- /dev/null
+++ b/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestHandlerStack.java
@@ -0,0 +1,225 @@
+/*
+ * 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.cycle;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.wicket.core.request.handler.IPageClassRequestHandler;
+import org.apache.wicket.core.request.handler.IPageRequestHandler;
+import org.apache.wicket.request.IRequestCycle;
+import org.apache.wicket.request.IRequestHandler;
+import org.apache.wicket.request.RequestHandlerStack.ReplaceHandlerException;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.util.lang.Args;
+import org.apache.wicket.util.lang.Exceptions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Manages stack of executions of {@link IRequestHandler}s.
+ *
+ * @author Matej Knopp
+ * @author igor.vaynberg
+ */
+public abstract class RequestHandlerStack
+{
+ private static final Logger log = LoggerFactory.getLogger(RequestHandlerStack.class);
+
+ // we need both Queue and List interfaces
+ private final LinkedList<IRequestHandler> requestHandlers = new LinkedList<>();
+
+ private final List<IRequestHandler> inactiveRequestHandlers = new ArrayList<>();
+
+ private IRequestHandler scheduledAfterCurrent = null;
+
+ /**
+ * @return active handler
+ */
+ public IRequestHandler getActive()
+ {
+ return requestHandlers.peek();
+ }
+
+ /**
+ * @param handler
+ */
+ public void execute(final IRequestHandler handler)
+ {
+ final boolean first = requestHandlers.isEmpty();
+ requestHandlers.add(handler);
+
+ IRequestHandler replacementHandler = null;
+ try
+ {
+ respond(handler);
+ }
+ catch (RuntimeException exception)
+ {
+ ReplaceHandlerException replacer = Exceptions.findCause(exception,
+ ReplaceHandlerException.class);
+
+ if (replacer == null)
+ {
+ throw exception;
+ }
+
+ if (replacer.isRemoveAll() && !first)
+ {
+ throw exception;
+ }
+ replacementHandler = replacer.getReplacementRequestHandler();
+ }
+ finally
+ {
+ requestHandlers.poll();
+ inactiveRequestHandlers.add(handler);
+ }
+
+ IRequestHandler scheduled = scheduledAfterCurrent;
+ scheduledAfterCurrent = null;
+
+ if (replacementHandler != null)
+ {
+ execute(replacementHandler);
+ }
+ else if (scheduled != null)
+ {
+ execute(scheduled);
+ }
+ }
+
+ /**
+ * Certain exceptions can carry a request handler they wish to be executed, this method tries to
+ * resolve such a handler given an exception.
+ *
+ * @param exception
+ * @return request handler or null} if one cannot be resolved
+ */
+ public final IRequestHandler resolveHandler(RuntimeException exception)
+ {
+ Args.notNull(exception, "exception");
+
+ ReplaceHandlerException replacer = Exceptions.findCause(exception,
+ ReplaceHandlerException.class);
+ return replacer != null ? replacer.getReplacementRequestHandler() : null;
+ }
+
+ /**
+ * Allows the request handler to respond to the request
+ *
+ * @param handler
+ */
+ protected abstract void respond(IRequestHandler handler);
+
+ /**
+ * Schedules the handler after the current one
+ *
+ * @param handler
+ */
+ public void schedule(final IRequestHandler handler)
+ {
+ scheduledAfterCurrent = handler;
+ }
+
+ /**
+ * @return scheduled request handler after the current one
+ */
+ public IRequestHandler next()
+ {
+ return scheduledAfterCurrent;
+ }
+
+ /**
+ * Replaces all request handlers on the stack with the specified one and executes it. If there
+ * are any request handlers currently executing (this method is called from inside
+ * {@link IRequestHandler#respond(IRequestCycle)}) the execution is interrupted via an
+ * exception.
+ *
+ * @param handler
+ */
+ public void replaceAll(final IRequestHandler handler)
+ {
+ if (requestHandlers.isEmpty())
+ {
+ execute(handler);
+ }
+ else
+ {
+ throw new ReplaceHandlerException(handler, true);
+ }
+ }
+
+ /**
+ * Detaches all request handlers
+ */
+ public void detach()
+ {
+ if (!requestHandlers.isEmpty())
+ {
+ // All requests handlers should be inactive at this point
+ log.warn("Some of the request handlers are still active.");
+
+ inactiveRequestHandlers.addAll(requestHandlers);
+ requestHandlers.clear();
+ }
+
+ Set<Class<? extends IRequestablePage>> detachedPages = new HashSet<>();
+ for (IRequestHandler handler : inactiveRequestHandlers)
+ {
+ Class<? extends IRequestablePage> pageClass = null;
+ if (handler instanceof IPageClassRequestHandler)
+ {
+ pageClass = ((IPageClassRequestHandler) handler).getPageClass();
+ }
+
+ if (pageClass == null)
+ {
+ internalDetach(handler);
+ }
+ else if (!detachedPages.contains(pageClass))
+ {
+ detachedPages.add(pageClass);
+ internalDetach(handler);
+ }
+ }
+ }
+
+ private void internalDetach(IRequestHandler handler)
+ {
+ try
+ {
+ detach(handler);
+ } catch (RuntimeException exception)
+ {
+ throw exception;
+ } catch (Exception exception)
+ {
+ log.error("Error detaching RequestHandler", exception);
+ }
+ }
+
+ /**
+ * Allows the request handler to detach
+ *
+ * @param handler
+ */
+ protected abstract void detach(IRequestHandler handler);
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d2bc4ad0/wicket-core/src/main/java/org/apache/wicket/session/DefaultPageFactory.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/session/DefaultPageFactory.java b/wicket-core/src/main/java/org/apache/wicket/session/DefaultPageFactory.java
index c11d652..a6ff279 100644
--- a/wicket-core/src/main/java/org/apache/wicket/session/DefaultPageFactory.java
+++ b/wicket-core/src/main/java/org/apache/wicket/session/DefaultPageFactory.java
@@ -278,4 +278,4 @@ public final class DefaultPageFactory implements IPageFactory
return bookmarkable;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d2bc4ad0/wicket-core/src/test/java/org/apache/wicket/request/cycle/BaseRequestHandlerStackTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/BaseRequestHandlerStackTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/BaseRequestHandlerStackTest.java
index bd5a315..547418e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/BaseRequestHandlerStackTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/BaseRequestHandlerStackTest.java
@@ -19,7 +19,6 @@ package org.apache.wicket.request.cycle;
import org.apache.wicket.request.IRequestCycle;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Request;
-import org.apache.wicket.request.RequestHandlerStack;
import org.apache.wicket.request.Response;
import org.apache.wicket.request.UrlRenderer;
http://git-wip-us.apache.org/repos/asf/wicket/blob/d2bc4ad0/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestHandlerStackTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestHandlerStackTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestHandlerStackTest.java
index 7839806..7915fdb 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestHandlerStackTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestHandlerStackTest.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertTrue;
import org.apache.wicket.request.IRequestCycle;
import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.RequestHandlerStack;
import org.apache.wicket.request.Response;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/d2bc4ad0/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java b/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java
index e3cbb33..0ccf9da 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java
@@ -16,187 +16,16 @@
*/
package org.apache.wicket.request;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.apache.wicket.util.lang.Args;
-import org.apache.wicket.util.lang.Exceptions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* Manages stack of executions of {@link IRequestHandler}s.
*
* @author Matej Knopp
* @author igor.vaynberg
+ * @deprecated Use the class with the same name from wicket-core
*/
+@Deprecated
public abstract class RequestHandlerStack
{
- private static final Logger log = LoggerFactory.getLogger(RequestHandlerStack.class);
-
- // we need both Queue and List interfaces
- private final LinkedList<IRequestHandler> requestHandlers = new LinkedList<>();
-
- private final List<IRequestHandler> inactiveRequestHandlers = new ArrayList<>();
-
- private IRequestHandler scheduledAfterCurrent = null;
-
- /**
- * @return active handler
- */
- public IRequestHandler getActive()
- {
- return requestHandlers.peek();
- }
-
- /**
- * @param handler
- */
- public void execute(final IRequestHandler handler)
- {
- final boolean first = requestHandlers.isEmpty();
- requestHandlers.add(handler);
-
- IRequestHandler replacementHandler = null;
- try
- {
- respond(handler);
- }
- catch (RuntimeException exception)
- {
- ReplaceHandlerException replacer = Exceptions.findCause(exception,
- ReplaceHandlerException.class);
-
- if (replacer == null)
- {
- throw exception;
- }
-
- if (replacer.removeAll && !first)
- {
- throw exception;
- }
- replacementHandler = replacer.replacementRequestHandler;
- }
- finally
- {
- requestHandlers.poll();
- inactiveRequestHandlers.add(handler);
- }
-
- IRequestHandler scheduled = scheduledAfterCurrent;
- scheduledAfterCurrent = null;
-
- if (replacementHandler != null)
- {
- execute(replacementHandler);
- }
- else if (scheduled != null)
- {
- execute(scheduled);
- }
- }
-
- /**
- * Certain exceptions can carry a request handler they wish to be executed, this method tries to
- * resolve such a handler given an exception.
- *
- * @param exception
- * @return request handler or null} if one cannot be resolved
- */
- public final IRequestHandler resolveHandler(RuntimeException exception)
- {
- Args.notNull(exception, "exception");
-
- ReplaceHandlerException replacer = Exceptions.findCause(exception,
- ReplaceHandlerException.class);
- return replacer != null ? replacer.replacementRequestHandler : null;
- }
-
- /**
- * Allows the request handler to respond to the request
- *
- * @param handler
- */
- protected abstract void respond(IRequestHandler handler);
-
- /**
- * Schedules the handler after the current one
- *
- * @param handler
- */
- public void schedule(final IRequestHandler handler)
- {
- scheduledAfterCurrent = handler;
- }
-
- /**
- * @return scheduled request handler after the current one
- */
- public IRequestHandler next()
- {
- return scheduledAfterCurrent;
- }
-
- /**
- * Replaces all request handlers on the stack with the specified one and executes it. If there
- * are any request handlers currently executing (this method is called from inside
- * {@link IRequestHandler#respond(IRequestCycle)}) the execution is interrupted via an
- * exception.
- *
- * @param handler
- */
- public void replaceAll(final IRequestHandler handler)
- {
- if (requestHandlers.isEmpty())
- {
- execute(handler);
- }
- else
- {
- throw new ReplaceHandlerException(handler, true);
- }
- }
-
- /**
- * Detaches all request handlers
- */
- public void detach()
- {
- if (!requestHandlers.isEmpty())
- {
- // All requests handlers should be inactive at this point
- log.warn("Some of the request handlers are still active.");
-
- inactiveRequestHandlers.addAll(requestHandlers);
- requestHandlers.clear();
- }
-
- for (IRequestHandler handler : inactiveRequestHandlers)
- {
- try
- {
- detach(handler);
- }
- catch (RuntimeException exception)
- {
- throw exception;
- }
- catch (Exception exception)
- {
- log.error("Error detaching RequestHandler", exception);
- }
- }
- }
-
- /**
- * Allows the request handler to detach
- *
- * @param handler
- */
- protected abstract void detach(IRequestHandler handler);
-
/**
* Exception to stop current request handler and execute a new one.
*
@@ -231,6 +60,11 @@ public abstract class RequestHandlerStack
return replacementRequestHandler;
}
+ public boolean isRemoveAll()
+ {
+ return removeAll;
+ }
+
/**
* @see java.lang.Throwable#fillInStackTrace()
*/