You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2012/12/18 06:12:20 UTC
svn commit: r1423273 - in /myfaces/extensions/cdi/trunk:
core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/
jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/
Author: gpetracek
Date: Tue Dec 18 05:12:18 2012
New Revision: 1423273
URL: http://svn.apache.org/viewvc?rev=1423273&view=rev
Log:
EXTCDI-304 improvement for openejb
Modified:
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationContextAdapter.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.java
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationContextAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationContextAdapter.java?rev=1423273&r1=1423272&r2=1423273&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationContextAdapter.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationContextAdapter.java Tue Dec 18 05:12:18 2012
@@ -93,6 +93,12 @@ public class ConversationContextAdapter
*/
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);
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.java?rev=1423273&r1=1423272&r2=1423273&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.java Tue Dec 18 05:12:18 2012
@@ -56,6 +56,12 @@ public class ViewScopedContext implement
*/
public <T> T get(Contextual<T> component)
{
+ //workaround for openejb - see EXTCDI-304
+ if (component == null)
+ {
+ return null;
+ }
+
checkActive();
if(!isJsfSubscribed)