svn commit: r1398282 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java

[rmannibucau]

Author: rmannibucau
Date: Mon Oct 15 13:19:31 2012
New Revision: 1398282

URL: http://svn.apache.org/viewvc?rev=1398282&view=rev
Log:
TOMEE-466 conversationscoped needs to be managed as requestscoped when not 
active - removing not compiling code

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java?rev=1398282&r1=1398281&r2=1398282&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
 Mon Oct 15 13:19:31 2012
@@ -1603,7 +1603,7 @@ public class BeanContext extends Deploym
         }
 
         final Class<? extends Annotation> scope = bean.getScope();
-        isPassivatingScope =  !bm.isNormalScope(scope) || 
(bm.isPassivatingScope(scope) && scope != ConversationScoped.class);
+        isPassivatingScope =  !bm.isNormalScope(scope) || 
bm.isPassivatingScope(scope);
     }
 
     public boolean isPassivatingScope() {
@@ -1615,7 +1615,7 @@ public class BeanContext extends Deploym
         if (ConversationScoped.class == bean.getScope()) {
             try {
                 return 
!bean.getWebBeansContext().getConversationManager().getConversationBeanReference().isTransient();
-            } catch (RuntimeException re) {
+            } catch (RuntimeException re) { // conversation not found for 
instance so act as @RequestScoped
                 return false;
             }
         }
@@ -1623,15 +1623,6 @@ public class BeanContext extends Deploym
         return isPassivatingScope;
     }
 
-    private boolean isConversationScopedAndActive() {
-        try {
-            return ConversationScoped.class == bean.getScope()
-                && 
!bean.getWebBeansContext().getConversationManager().getConversationBeanReference().isTransient();
-        } catch (Exception e) { // error looking for transient state, let 
assume the conversation doesn't exist
-            return true;
-        }
-    }
-
     public void stop() {
         if (ejbTimerService != null && ejbTimerService instanceof 
EjbTimerServiceImpl) {
             ((EjbTimerServiceImpl) ejbTimerService).shutdownMe();