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

[Gavin King]

  User: gavin   
  Date: 07/02/03 20:13:19

  Modified:    src/main/org/jboss/seam/interceptors  
                        SecurityInterceptor.java
  Removed:     src/main/org/jboss/seam/interceptors  
                        ExceptionInterceptor.java
  Log:
  redesigned exception handling
  
  Revision  Changes    Path
  1.26      +5 -1      jboss-seam/src/main/org/jboss/seam/interceptors/SecurityInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SecurityInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/SecurityInterceptor.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -b -r1.25 -r1.26
  --- SecurityInterceptor.java	25 Jan 2007 16:40:46 -0000	1.25
  +++ SecurityInterceptor.java	4 Feb 2007 01:13:19 -0000	1.26
  @@ -15,7 +15,7 @@
    * @author Shane Bryzak
    */
   @Interceptor(stateless = true, around = ValidationInterceptor.class, 
  -         within = {BijectionInterceptor.class, ExceptionInterceptor.class})
  +         within = BijectionInterceptor.class)
   public class SecurityInterceptor extends AbstractInterceptor
   {
      private static final long serialVersionUID = -6567750187000766925L;
  @@ -28,9 +28,13 @@
         Method method = invocation.getMethod();
   
         if (method.isAnnotationPresent(Restrict.class))
  +      {
            r = method.getAnnotation(Restrict.class);
  +      }
         else if (method.getDeclaringClass().isAnnotationPresent(Restrict.class))
  +      {
            r = method.getDeclaringClass().getAnnotation(Restrict.class);
  +      }
   
         if (r != null)
         {