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

[Gavin King]

  User: gavin   
  Date: 07/02/26 16:31:05

  Modified:    src/main/org/jboss/seam/intercept  JavaBeanInterceptor.java
  Log:
  oops, fix broken clustering
  
  Revision  Changes    Path
  1.12      +35 -26    jboss-seam/src/main/org/jboss/seam/intercept/JavaBeanInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JavaBeanInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/intercept/JavaBeanInterceptor.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- JavaBeanInterceptor.java	21 Dec 2006 02:38:27 -0000	1.11
  +++ JavaBeanInterceptor.java	26 Feb 2007 21:31:05 -0000	1.12
  @@ -1,8 +1,10 @@
  -//$Id: JavaBeanInterceptor.java,v 1.11 2006/12/21 02:38:27 sbryzak2 Exp $
  +//$Id: JavaBeanInterceptor.java,v 1.12 2007/02/26 21:31:05 gavin Exp $
   package org.jboss.seam.intercept;
   
   import java.lang.reflect.Method;
   
  +import javax.servlet.http.HttpSessionEvent;
  +
   import net.sf.cglib.proxy.Factory;
   import net.sf.cglib.proxy.MethodInterceptor;
   import net.sf.cglib.proxy.MethodProxy;
  @@ -39,7 +41,9 @@
            final MethodProxy methodProxy) throws Throwable
      {
   
  -      if ( params!=null && params.length==0 )
  +      if ( params!=null )
  +      {
  +         if ( params.length==0 )
         {
            String methodName = method.getName();
            if ( "finalize".equals(methodName) ) 
  @@ -50,7 +54,18 @@
            {
               return this;
            }
  -         else if ( "sessionDidActivate".equals(methodName) )
  +            else if ( "clearDirty".equals(methodName) && !(bean instanceof Mutable) )
  +            {
  +               //clear and return the dirty flag
  +               boolean result = dirty;
  +               dirty = false;
  +               return result;
  +            }
  +         }
  +         else if ( params.length==1 && (params[0] instanceof HttpSessionEvent) )
  +         {
  +            String methodName = method.getName();
  +            if ( "sessionDidActivate".equals(methodName) )
            {
               callPostActivate();
               return null;
  @@ -60,12 +75,6 @@
               callPrePassivate();
               return null;
            }
  -         else if ( "clearDirty".equals(methodName) && !(bean instanceof Mutable) )
  -         {
  -            //clear and return the dirty flag
  -            boolean result = dirty;
  -            dirty = false;
  -            return result;
            }
         }