vmassol     01/12/01 15:20:59

  Modified:    src/framework/share/org/apache/cactus/util/log
                        LogAspect.java
  Log:
  replaced call() by execution() as it is really what we want to do
  
  Revision  Changes    Path
  1.3       +8 -8      
jakarta-cactus/src/framework/share/org/apache/cactus/util/log/LogAspect.java
  
  Index: LogAspect.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/util/log/LogAspect.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LogAspect.java    2001/12/01 13:48:40     1.2
  +++ LogAspect.java    2001/12/01 23:20:59     1.3
  @@ -61,7 +61,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
    *
  - * @version $Id: LogAspect.java,v 1.2 2001/12/01 13:48:40 vmassol Exp $
  + * @version $Id: LogAspect.java,v 1.3 2001/12/01 23:20:59 vmassol Exp $
    */
   public aspect LogAspect
   {
  @@ -70,28 +70,28 @@
        * perform the logging and thus at execution time we would enter an infinite 
recursive loop.
        */
       pointcut logObjectCalls() :
  -        call(public * org.apache.cactus.util.log..*(..));
  +        execution(public * org.apache.cactus.util.log..*(..));
   
       /**
        * All public static methods that have parameters.
        */
       pointcut publicStaticMethodsWithParameterCalls() :
  -        !call(public static * org.apache.cactus..*()) &&
  -        call(public static * org.apache.cactus..*(..));
  +        !execution(public static * org.apache.cactus..*()) &&
  +        execution(public static * org.apache.cactus..*(..));
   
       /**
        * All public methods that have parameters.
        */
       pointcut publicMethodsWithParameterCalls() :
  -        !call(public * org.apache.cactus..*()) &&
  -        call(public * org.apache.cactus..*(..));
  +        !execution(public * org.apache.cactus..*()) &&
  +        execution(public * org.apache.cactus..*(..));
   
       /**
        * All public methods that return values
        */
       pointcut publicMethodsWithReturnValueCalls() :
  -        !call(public void org.apache.cactus..*(..)) &&
  -        call(public * org.apache.cactus..*(..));
  +        !execution(public void org.apache.cactus..*(..)) &&
  +        execution(public * org.apache.cactus..*(..));
   
       /**
        * Log all entries and exits of static methods that have no return values.
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to