Repository: deltaspike Updated Branches: refs/heads/master 9c811f2e7 -> b4126f708
DELTASPIKE-1232: WeldContextControl should use Weld API instead of having internal dependencies. Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/b4126f70 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/b4126f70 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/b4126f70 Branch: refs/heads/master Commit: b4126f708c8d163c660bac23230ca670a17e26c6 Parents: 9c811f2 Author: Matej Novotny <[email protected]> Authored: Mon Jan 23 15:54:54 2017 +0100 Committer: Matej Novotny <[email protected]> Committed: Mon Jan 23 15:54:54 2017 +0100 ---------------------------------------------------------------------- deltaspike/cdictrl/impl-weld/pom.xml | 6 ++++++ .../org/apache/deltaspike/cdise/weld/WeldContextControl.java | 8 +------- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b4126f70/deltaspike/cdictrl/impl-weld/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/cdictrl/impl-weld/pom.xml b/deltaspike/cdictrl/impl-weld/pom.xml index 5fa3c30..e1432d2 100644 --- a/deltaspike/cdictrl/impl-weld/pom.xml +++ b/deltaspike/cdictrl/impl-weld/pom.xml @@ -45,6 +45,12 @@ <version>${weld.version}</version> <scope>provided</scope> </dependency> + + <!-- Version will de derived from BOM in parent-code --> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api</artifactId> + </dependency> <dependency> <groupId>javax.el</groupId> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b4126f70/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 bbe0292..cf4f25b 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 @@ -25,12 +25,12 @@ import javax.enterprise.context.RequestScoped; import javax.enterprise.context.SessionScoped; import javax.enterprise.inject.Instance; import javax.inject.Inject; + import java.lang.annotation.Annotation; import java.util.HashMap; import java.util.Map; import org.apache.deltaspike.cdise.api.ContextControl; -import org.jboss.weld.context.AbstractSharedContext; import org.jboss.weld.context.ApplicationContext; import org.jboss.weld.context.bound.BoundConversationContext; import org.jboss.weld.context.bound.BoundRequestContext; @@ -152,12 +152,6 @@ public class WeldContextControl implements ContextControl { // destroys the bean instances, but the context stays active applicationContext.invalidate(); - - //needed for weld < v1.1.9 - if (applicationContext instanceof AbstractSharedContext) - { - ((AbstractSharedContext) applicationContext).getBeanStore().clear(); - } } }
