DELTASPIKE-490 WindowContextImpl#closeWindow fixed
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/db3605e8 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/db3605e8 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/db3605e8 Branch: refs/heads/master Commit: db3605e8eff803e09138288d16df2a3ee8948c0e Parents: 9429d0e Author: gpetracek <[email protected]> Authored: Fri Jan 3 00:33:20 2014 +0100 Committer: gpetracek <[email protected]> Committed: Fri Jan 3 00:33:20 2014 +0100 ---------------------------------------------------------------------- .../deltaspike/core/impl/scope/window/WindowContextImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/db3605e8/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java index e0f8cc6..1f8795f 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java @@ -93,7 +93,13 @@ public class WindowContextImpl extends AbstractContext implements WindowContext return false; } - ContextualStorage windowStorage = windowBeanHolder.getContextualStorage(beanManager, windowId, false); + ContextualStorage windowStorage = windowBeanHolder.getStorageMap().remove(windowId); + + if (windowStorage != null) + { + AbstractContext.destroyAllActive(windowStorage); + } + return windowStorage != null; }
