[openwebbeans] branch master updated: OWB-1295

[tandraschko]

This is an automated email from the ASF dual-hosted git repository.

tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git


The following commit(s) were added to refs/heads/master by this push:
     new 7ff95a2  OWB-1295
7ff95a2 is described below

commit 7ff95a235c1a983f40a7c1f87364f52d9ea2d2a6
Author: Thomas Andraschko <tandrasc...@apache.org>
AuthorDate: Mon Jul 22 10:40:29 2019 +0200

    OWB-1295
---
 .../org/apache/webbeans/jsf/ConversationAwareViewHandler.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java
 
b/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java
index 64f434d..cf32a6d 100644
--- 
a/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java
+++ 
b/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java
@@ -23,7 +23,7 @@ import java.util.Map;
 import javax.enterprise.context.ContextNotActiveException;
 
 import javax.enterprise.context.Conversation;
-import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.context.SessionScoped;
 import javax.enterprise.context.spi.Context;
 import javax.faces.application.ViewHandler;
 import javax.faces.application.ViewHandlerWrapper;
@@ -59,8 +59,8 @@ public class ConversationAwareViewHandler extends 
ViewHandlerWrapper
         {
             WebBeansContext webBeansContext = 
WebBeansContext.currentInstance();
             
-            Context conversationContext = 
webBeansContext.getBeanManagerImpl().getContext(ConversationScoped.class);
-            if (conversationContext.isActive())
+            Context sessionContext = 
webBeansContext.getBeanManagerImpl().getContext(SessionScoped.class);
+            if (sessionContext.isActive())
             {
                 Conversation conversation = 
webBeansContext.getConversationManager().getConversationBeanReference();
                 if (conversation != null && !conversation.isTransient())
@@ -116,8 +116,8 @@ public class ConversationAwareViewHandler extends 
ViewHandlerWrapper
         {
             WebBeansContext webBeansContext = 
WebBeansContext.currentInstance();
             
-            Context conversationContext = 
webBeansContext.getBeanManagerImpl().getContext(ConversationScoped.class);
-            if (conversationContext.isActive())
+            Context sessionContext = 
webBeansContext.getBeanManagerImpl().getContext(SessionScoped.class);
+            if (sessionContext.isActive())
             {
                 Conversation conversation = 
webBeansContext.getConversationManager().getConversationBeanReference();
                 if (conversation != null && !conversation.isTransient())