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

[Gavin King]

  User: gavin   
  Date: 06/10/04 19:42:52

  Modified:    src/main/org/jboss/seam  Component.java
  Log:
  fix bug where components of non-default role got initialized with values from the default role
  
  Revision  Changes    Path
  1.173     +11 -2     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.172
  retrieving revision 1.173
  diff -u -b -r1.172 -r1.173
  --- Component.java	4 Oct 2006 22:31:32 -0000	1.172
  +++ Component.java	4 Oct 2006 23:42:52 -0000	1.173
  @@ -77,6 +77,7 @@
   import org.jboss.seam.core.Expressions.ValueBinding;
   import org.jboss.seam.databinding.DataBinder;
   import org.jboss.seam.databinding.DataSelector;
  +import org.jboss.seam.ejb.SeamInterceptor;
   import org.jboss.seam.interceptors.BijectionInterceptor;
   import org.jboss.seam.interceptors.BusinessProcessInterceptor;
   import org.jboss.seam.interceptors.ClientSideInterceptor;
  @@ -106,7 +107,7 @@
    *
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
    * @author Gavin King
  - * @version $Revision: 1.172 $
  + * @version $Revision: 1.173 $
    */
   @Scope(ScopeType.APPLICATION)
   public class Component
  @@ -894,8 +895,16 @@
       
      protected Object instantiateSessionBean() throws Exception, NamingException
      {
  +      SeamInterceptor.COMPONENT.set(this);
  +      try
  +      {
         return wrap( Naming.getInitialContext().lookup(jndiName) );
      }
  +      finally
  +      {
  +         SeamInterceptor.COMPONENT.set(null);
  +      }
  +   }
   
      protected Object instantiateEntityBean() throws Exception
      {