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

[Gavin King]

  User: gavin   
  Date: 07/02/25 18:15:06

  Modified:    src/main/org/jboss/seam/intercept   RootInterceptor.java
                        SessionBeanInterceptor.java
  Log:
  ahem, much better
  
  Revision  Changes    Path
  1.12      +5 -0      jboss-seam/src/main/org/jboss/seam/intercept/RootInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RootInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/intercept/RootInterceptor.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- RootInterceptor.java	16 Feb 2007 23:33:31 -0000	1.11
  +++ RootInterceptor.java	25 Feb 2007 23:15:06 -0000	1.12
  @@ -204,6 +204,11 @@
         return component;
      }
   
  +   protected boolean isSeamComponent()
  +   {
  +      return isSeamComponent;
  +   }
  +
      protected String getComponentName()
      {
         return componentName;
  
  
  
  1.14      +3 -3      jboss-seam/src/main/org/jboss/seam/intercept/SessionBeanInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SessionBeanInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/intercept/SessionBeanInterceptor.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- SessionBeanInterceptor.java	25 Feb 2007 23:03:04 -0000	1.13
  +++ SessionBeanInterceptor.java	25 Feb 2007 23:15:06 -0000	1.14
  @@ -102,7 +102,7 @@
            {
               log.trace("post construct phase for component instantiated outside Seam, assuming default role: " + defaultComponentName);
            }
  -         init( Seam.componentForName( defaultComponentName ) );
  +         init( Seam.componentForName(defaultComponentName) );
         }
         else
         {
  @@ -113,10 +113,10 @@
            initNonSeamComponent();
         }
         
  -      if ( invokingComponent!=null )
  +      if ( isSeamComponent() )
         {
            //wrap any @PersistenceContext attributes in our proxy
  -         for ( BijectedAttribute ba: invokingComponent.getPersistenceContextAttributes() )
  +         for ( BijectedAttribute ba: getComponent().getPersistenceContextAttributes() )
            {
               ba.set( bean, new EntityManagerProxy( (EntityManager) ba.get(bean) ) );
            }