| commit | 7645eb2599e5b81d18604346b54d910bc47d0d0b | [log] [tgz] |
|---|---|---|
| author | Gerhard Petracek <gpetracek@apache.org> | Tue Dec 18 05:12:18 2012 +0000 |
| committer | Gerhard Petracek <gpetracek@apache.org> | Tue Dec 18 05:12:18 2012 +0000 |
| tree | 744cc5466ddd845848a06f2791fadd4207439577 | |
| parent | 791def5b17b754f8071dd71bef877d6984fa2dc0 [diff] |
EXTCDI-304 improvement for openejb git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/cdi/trunk@1423273 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 b0bd42d..78f65eb 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
@@ -93,6 +93,12 @@ */ public <T> T get(Contextual<T> component) { + //workaround for openejb - see EXTCDI-304 + if (component == null) + { + return null; + } + if (component instanceof Bean) { return this.conversationContext.resolve((Bean<T>)component);
diff --git a/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.java b/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.java index 1739951..8e87dea 100644 --- a/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.java +++ b/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.java
@@ -56,6 +56,12 @@ */ public <T> T get(Contextual<T> component) { + //workaround for openejb - see EXTCDI-304 + if (component == null) + { + return null; + } + checkActive(); if(!isJsfSubscribed)