Repository: wicket Updated Branches: refs/heads/wicket-7.x 37a961b7f -> 8361b8bee
WICKET-6157 WicketTester and application servers are destroying app differently Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8361b8be Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8361b8be Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8361b8be Branch: refs/heads/wicket-7.x Commit: 8361b8bee3b83a61630ff397d1aa84e0748e8e27 Parents: 37a961b Author: Andrea Del Bene <[email protected]> Authored: Fri May 6 18:12:38 2016 +0200 Committer: Andrea Del Bene <[email protected]> Committed: Fri May 6 18:12:38 2016 +0200 ---------------------------------------------------------------------- .../apache/wicket/util/tester/BaseWicketTester.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/8361b8be/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java index d1d7dfc..3cbe313 100644 --- a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java +++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java @@ -40,8 +40,6 @@ import javax.servlet.ServletContext; import javax.servlet.http.Cookie; import javax.servlet.http.HttpSession; -import junit.framework.AssertionFailedError; - import org.apache.wicket.Application; import org.apache.wicket.Component; import org.apache.wicket.IPageManagerProvider; @@ -140,6 +138,8 @@ import org.apache.wicket.util.visit.IVisitor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import junit.framework.AssertionFailedError; + /** * A helper class to ease unit testing of Wicket applications without the need for a servlet * container. See javadoc of <code>WicketTester</code> for example usage. This class can be used as @@ -613,8 +613,15 @@ public class BaseWicketTester */ public void destroy() { - application.internalDestroy(); - ThreadContext.detach(); + try + { + ThreadContext.setApplication(application); + application.internalDestroy(); + } + finally + { + ThreadContext.detach(); + } } /**
