[seam-commits] Seam SVN: r8807 - branches/Seam_2_0/src/main/org/jboss/seam/core.

[seam-commits at lists.jboss.org]

Author: shane.bryzak at jboss.com
Date: 2008-08-26 08:15:58 -0400 (Tue, 26 Aug 2008)
New Revision: 8807

Modified:
   branches/Seam_2_0/src/main/org/jboss/seam/core/BijectionInterceptor.java
Log:
all components treated equally

Modified: branches/Seam_2_0/src/main/org/jboss/seam/core/BijectionInterceptor.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/core/BijectionInterceptor.java	2008-08-26 09:31:27 UTC (rev 8806)
+++ branches/Seam_2_0/src/main/org/jboss/seam/core/BijectionInterceptor.java	2008-08-26 12:15:58 UTC (rev 8807)
@@ -23,22 +23,11 @@
    private static final long serialVersionUID = 4686458105931528659L;
    
    private boolean injected;
-   
-   private boolean canDisinject;
-   
+     
    private int counter = 0;
    
    private ReentrantLock lock = new ReentrantLock();
-   
-   @Override
-   public void setComponent(Component component)
-   {
-      super.setComponent(component);
-            
-      canDisinject = !(component.getScope().equals(ScopeType.SESSION) 
-            || component.getScope().equals(ScopeType.APPLICATION));
-   }
-      
+         
    @AroundInvoke
    public Object aroundInvoke(InvocationContext invocation) throws Exception
    {
@@ -79,7 +68,7 @@
                finally
                {
                   // Avoid an extra lock by disinjecting here instead of the finally block
-                  if (injected && canDisinject)
+                  if (injected)
                   {
                      injected = false;
                      component.disinject( invocation.getTarget() );
@@ -96,7 +85,7 @@
       }
       finally
       {            
-         if (injected && canDisinject)
+         if (injected)
          {
             lock.lock();
             try