Repository: deltaspike Updated Branches: refs/heads/master 72bf21777 -> b671c09c9
DELTASPIKE-546 improved weld compatibility Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/b671c09c Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/b671c09c Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/b671c09c Branch: refs/heads/master Commit: b671c09c9d2be2c9d4e4af9fb192e23d2359b84e Parents: 72bf217 Author: tandraschko <[email protected]> Authored: Mon Mar 24 19:03:07 2014 +0100 Committer: tandraschko <[email protected]> Committed: Mon Mar 24 19:03:07 2014 +0100 ---------------------------------------------------------------------- .../apache/deltaspike/core/util/context/AbstractContext.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b671c09c/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/AbstractContext.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/AbstractContext.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/AbstractContext.java index 623266e..c5a384b 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/AbstractContext.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/AbstractContext.java @@ -94,6 +94,11 @@ public abstract class AbstractContext implements Context @Override public <T> T get(Contextual<T> bean, CreationalContext<T> creationalContext) { + if (creationalContext == null) + { + return null; + } + checkActive(); if (passivatingScope)
