Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

EXTCDI-304 improvement for openejb

git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/cdi/trunk@1423273 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit 7645eb2599e5b81d18604346b54d910bc47d0d0b 1 parent 791def5
@gpetracek gpetracek authored
View
6 ...main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationContextAdapter.java
@@ -93,6 +93,12 @@ public ConversationContextAdapter(Class<? extends Annotation> scope,
*/
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);
View
6 ...-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)
Please sign in to comment.
Something went wrong with that request. Please try again.