You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by jo...@apache.org on 2013/10/14 03:03:58 UTC
git commit: DELTASPIKE-427 Leverage the null check better so that the
message is at least logged.
Updated Branches:
refs/heads/master b209f589a -> 38b99026b
DELTASPIKE-427 Leverage the null check better so that the message is at least logged.
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/38b99026
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/38b99026
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/38b99026
Branch: refs/heads/master
Commit: 38b99026b59f3a97fa9c6f495e79c9f9f417afb7
Parents: b209f58
Author: John D. Ament <jo...@gmail.com>
Authored: Sun Oct 13 21:03:10 2013 -0400
Committer: John D. Ament <jo...@gmail.com>
Committed: Sun Oct 13 21:03:10 2013 -0400
----------------------------------------------------------------------
.../org/apache/deltaspike/cdise/weld/WeldContainerControl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/38b99026/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContainerControl.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContainerControl.java b/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContainerControl.java
index 7c1a28a..361b8b2 100644
--- a/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContainerControl.java
+++ b/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContainerControl.java
@@ -94,7 +94,6 @@ public class WeldContainerControl implements CdiContainer
{
if (ctxCtrl == null)
{
- Set<Bean<?>> beans = getBeanManager().getBeans(ContextControl.class);
BeanManager beanManager = getBeanManager();
if (beanManager == null)
@@ -106,6 +105,7 @@ public class WeldContainerControl implements CdiContainer
return null;
}
+ Set<Bean<?>> beans = beanManager.getBeans(ContextControl.class);
ctxCtrlBean = (Bean<ContextControl>) beanManager.resolve(beans);
ctxCtrlCreationalContext = getBeanManager().createCreationalContext(ctxCtrlBean);