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

[Gavin King]

  User: gavin   
  Date: 07/02/01 00:03:29

  Modified:    src/main/org/jboss/seam/interceptors 
                        BijectionInterceptor.java
  Log:
  fixed bug where interceptor was not serializable
  
  Revision  Changes    Path
  1.27      +5 -5      jboss-seam/src/main/org/jboss/seam/interceptors/BijectionInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BijectionInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/BijectionInterceptor.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -b -r1.26 -r1.27
  --- BijectionInterceptor.java	8 Jan 2007 19:10:02 -0000	1.26
  +++ BijectionInterceptor.java	1 Feb 2007 05:03:29 -0000	1.27
  @@ -1,4 +1,4 @@
  -//$Id: BijectionInterceptor.java,v 1.26 2007/01/08 19:10:02 gavin Exp $
  +//$Id: BijectionInterceptor.java,v 1.27 2007/02/01 05:03:29 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import static org.jboss.seam.util.EJB.POST_ACTIVATE;
  @@ -29,7 +29,7 @@
      
      private static final LogProvider log = Logging.getLogProvider(BijectionInterceptor.class);
      
  -   private ThreadLocal<Boolean> reentrant = new ThreadLocal<Boolean>();
  +   private boolean reentrant; //OK, since all Seam components are single-threaded
      
      private static boolean isLifecycleMethod(Method method)
      {
  @@ -42,7 +42,7 @@
      @AroundInvoke
      public Object bijectComponent(InvocationContext invocation) throws Exception
      {
  -      if ( reentrant.get()!=null )
  +      if (reentrant)
         {
            if ( log.isTraceEnabled() )
            {
  @@ -52,14 +52,14 @@
         }
         else
         {
  -         reentrant.set(true);
  +         reentrant = true;
            try
            {
               return bijectNonreentrantComponent(invocation);
            }
            finally
            {
  -            reentrant.set(null);
  +            reentrant = false;
            }
         }
      }