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 2011/11/02 11:02:30 UTC

svn commit: r1196530 - /myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/GroupedConversationContextExtension.java

Author: gpetracek
Date: Wed Nov  2 10:02:29 2011
New Revision: 1196530

URL: http://svn.apache.org/viewvc?rev=1196530&view=rev
Log:
EXTCDI-232 currently only grouped conversations are compatible with conversation groups

Modified:
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/GroupedConversationContextExtension.java

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/GroupedConversationContextExtension.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/GroupedConversationContextExtension.java?rev=1196530&r1=1196529&r2=1196530&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/GroupedConversationContextExtension.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/GroupedConversationContextExtension.java Wed Nov  2 10:02:29 2011
@@ -89,8 +89,7 @@ public class GroupedConversationContextE
             annotationType = qualifier.annotationType();
 
             if(ConversationGroup.class.isAssignableFrom(annotationType) &&
-               !(ConversationScoped.class.isAssignableFrom(bean.getScope()) ||
-                 RestScoped.class.isAssignableFrom(bean.getScope())))
+                    !ConversationScoped.class.isAssignableFrom(bean.getScope()))
             {
                 String errorMessage = "Definition error in class: " + bean.getBeanClass().getName() +
                         "\nIt isn't allowed to use @" + ConversationGroup.class.getName() +