[jboss-cvs] jboss-seam/src/main/org/jboss/seam ...

[Gavin King]

  User: gavin   
  Date: 06/11/24 18:51:22

  Modified:    src/main/org/jboss/seam  Component.java
  Log:
  fix bugs in latest @Install code
  
  Revision  Changes    Path
  1.213     +4 -4      jboss-seam/src/main/org/jboss/seam/Component.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Component.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/Component.java,v
  retrieving revision 1.212
  retrieving revision 1.213
  diff -u -b -r1.212 -r1.213
  --- Component.java	24 Nov 2006 22:09:21 -0000	1.212
  +++ Component.java	24 Nov 2006 23:51:22 -0000	1.213
  @@ -120,7 +120,7 @@
    *
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
    * @author Gavin King
  - * @version $Revision: 1.212 $
  + * @version $Revision: 1.213 $
    */
   @Scope(ScopeType.APPLICATION)
   @SuppressWarnings("deprecation")
  @@ -1631,17 +1631,17 @@
            Init.FactoryMethod factoryMethod = init.getFactory(name);
            Init.FactoryBinding methodBinding = init.getFactoryMethodBinding(name);
            Init.FactoryBinding valueBinding = init.getFactoryValueBinding(name);
  -         if ( methodBinding!=null && methodBinding.getScope().isContextActive() ) //let the XML take precedence
  +         if ( methodBinding!=null && getOutScope( methodBinding.getScope(), null ).isContextActive() ) //let the XML take precedence
            {
               Object result = methodBinding.getMethodBinding().invoke();
               return handleFactoryMethodResult( name, null, result, methodBinding.getScope() );
            }
  -         else if ( valueBinding!=null && valueBinding.getScope().isContextActive() ) //let the XML take precedence
  +         else if ( valueBinding!=null && getOutScope( valueBinding.getScope(), null ).isContextActive() ) //let the XML take precedence
            {
               Object result = valueBinding.getValueBinding().getValue();
               return handleFactoryMethodResult( name, null, result, valueBinding.getScope() );
            }
  -         else if ( factoryMethod!=null && factoryMethod.getScope().isContextActive() )
  +         else if ( factoryMethod!=null && getOutScope( factoryMethod.getScope(), factoryMethod.getComponent() ).isContextActive() )
            {
               Object factory = Component.getInstance( factoryMethod.getComponent().getName(), true );
               if (factory==null)