| commit | 3bfe163e4a265699aaaa9d12554b40fe572b6b17 | [log] [tgz] |
|---|---|---|
| author | Gerhard Petracek <gpetracek@apache.org> | Mon Mar 24 12:02:20 2014 +0000 |
| committer | Gerhard Petracek <gpetracek@apache.org> | Mon Mar 24 12:02:20 2014 +0000 |
| tree | e58a9b8d96fc0437bd2a6fd64c5023df1d05c80d | |
| parent | 8305ca5a61dca1ef5122b5a1b6f4d4c2c0c29e74 [diff] |
EXTCDI-315 improved compatibility git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/cdi/trunk@1580819 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationContextAdapter.java b/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationContextAdapter.java index 11a4248..f5ad934 100644 --- a/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationContextAdapter.java +++ b/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationContextAdapter.java
@@ -73,6 +73,11 @@ */ public <T> T get(Contextual<T> component, CreationalContext<T> creationalContext) { + if (creationalContext == null) + { + return null; + } + if (component instanceof PassivationCapable && !(component instanceof Bean)) { component = (Contextual<T>) BeanManagerProvider.getInstance().getBeanManager()