Repository: wicket Updated Branches: refs/heads/master 89c1290cb -> 95863397d
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/95863397 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/95863397 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/95863397 Branch: refs/heads/master Commit: 95863397de43ca4e42cd6649577ea1f279c53c3b Parents: 89c1290 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 22:13:16 2016 +0200 ---------------------------------------------------------------------- .../org/apache/wicket/util/tester/BaseWicketTester.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/95863397/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 1eab3af..328c63a 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 @@ -602,8 +602,15 @@ public class BaseWicketTester */ public void destroy() { - application.internalDestroy(); - ThreadContext.detach(); + try + { + ThreadContext.setApplication(application); + application.internalDestroy(); + } + finally + { + ThreadContext.detach(); + } } /**
