Repository: deltaspike Updated Branches: refs/heads/master 4f4dc13d7 -> 6e62f8eb3
DELTASPIKE-745 remove overly strict startContext checks Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/115322c0 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/115322c0 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/115322c0 Branch: refs/heads/master Commit: 115322c0611b056031c55d78e0926d888102700e Parents: 4f4dc13 Author: Mark Struberg <[email protected]> Authored: Thu Oct 30 08:50:45 2014 +0100 Committer: Mark Struberg <[email protected]> Committed: Mon Nov 17 07:07:24 2014 +0100 ---------------------------------------------------------------------- .../apache/deltaspike/cdise/weld/WeldContextControl.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/115322c0/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContextControl.java ---------------------------------------------------------------------- diff --git a/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContextControl.java b/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContextControl.java index 9a2cc36..e1ef95f 100644 --- a/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContextControl.java +++ b/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContextControl.java @@ -161,14 +161,9 @@ public class WeldContextControl implements ContextControl { rcHolder = new RequestContextHolder(requestContextFactory.get(), new HashMap<String, Object>()); requestContexts.set(rcHolder); + rcHolder.getBoundRequestContext().associate(rcHolder.getRequestMap()); + rcHolder.getBoundRequestContext().activate(); } - else - { - throw new IllegalStateException(RequestScoped.class.getName() + " started already"); - } - - rcHolder.getBoundRequestContext().associate(rcHolder.getRequestMap()); - rcHolder.getBoundRequestContext().activate(); } void stopRequestScope()
