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

[Gavin King]

  User: gavin   
  Date: 07/02/05 00:05:26

  Modified:    src/main/org/jboss/seam  Component.java
  Log:
  let the log field be static
  
  Revision  Changes    Path
  1.230     +8 -7      jboss-seam/src/main/org/jboss/seam/Component.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Component.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/Component.java,v
  retrieving revision 1.229
  retrieving revision 1.230
  diff -u -b -r1.229 -r1.230
  --- Component.java	5 Feb 2007 04:49:04 -0000	1.229
  +++ Component.java	5 Feb 2007 05:05:26 -0000	1.230
  @@ -124,7 +124,7 @@
    *
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
    * @author Gavin King
  - * @version $Revision: 1.229 $
  + * @version $Revision: 1.230 $
    */
   @Scope(ScopeType.APPLICATION)
   @SuppressWarnings("deprecation")
  @@ -554,6 +554,12 @@
   
            for (Field field: clazz.getDeclaredFields())
            {
  +
  +            if ( !field.isAccessible() )
  +            {
  +               field.setAccessible(true);
  +            }
  +
               if ( field.isAnnotationPresent(In.class) )
               {
                  inFields.add(field);
  @@ -585,7 +591,7 @@
                  if ( Modifier.isStatic( field.getModifiers() ) )
                  {
                     Reflections.setAndWrap(field, null, logInstance);
  -                  logInstance = null;
  +                  logField = null;
                  }
               }
               for ( Annotation ann: field.getAnnotations() )
  @@ -602,11 +608,6 @@
                  }
               }
   
  -            if ( !field.isAccessible() )
  -            {
  -               field.setAccessible(true);
  -            }
  -
            }
   
         }