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

[Gavin King]

  User: gavin   
  Date: 07/06/20 13:49:42

  Modified:    src/main/org/jboss/seam/contexts   FacesLifecycle.java
                        Lifecycle.java
  Log:
  refactored interception annotations
  
  Revision  Changes    Path
  1.4       +5 -4      jboss-seam/src/main/org/jboss/seam/contexts/FacesLifecycle.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FacesLifecycle.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/FacesLifecycle.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- FacesLifecycle.java	20 Jun 2007 15:53:32 -0000	1.3
  +++ FacesLifecycle.java	20 Jun 2007 17:49:42 -0000	1.4
  @@ -21,22 +21,23 @@
    */
   public class FacesLifecycle
   {
  +   private static ThreadLocal<PhaseId> phaseId = new ThreadLocal<PhaseId>();
   
      private static final LogProvider log = Logging.getLogProvider(FacesLifecycle.class);
      
      public static void setPhaseId(PhaseId phase)
      {
  -      Lifecycle.setPhaseId(phase);
  +      phaseId.set(phase);
      }
      
      public static PhaseId getPhaseId()
      {
  -      return (PhaseId) Lifecycle.getPhaseId();
  +      return phaseId.get();
      }
   
      public static void clearPhaseId()
      {
  -      Lifecycle.setPhaseId(null);
  +      setPhaseId(null);
      }
   
      public static void beginRequest(ExternalContext externalContext) 
  @@ -78,7 +79,7 @@
            if (sessionInvalid)
            {
               Lifecycle.clearThreadlocals();
  -            Lifecycle.setPhaseId(null);
  +            clearPhaseId();
               invalidateSession(externalContext);
               //actual session context will be destroyed from the listener
            }
  
  
  
  1.103     +0 -11     jboss-seam/src/main/org/jboss/seam/contexts/Lifecycle.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Lifecycle.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/Lifecycle.java,v
  retrieving revision 1.102
  retrieving revision 1.103
  diff -u -b -r1.102 -r1.103
  --- Lifecycle.java	20 Jun 2007 08:36:11 -0000	1.102
  +++ Lifecycle.java	20 Jun 2007 17:49:42 -0000	1.103
  @@ -26,17 +26,6 @@
   
      private static ThreadLocal<Boolean> destroying = new ThreadLocal<Boolean>();
      private static Map<String, Object> application;
  -   private static ThreadLocal phaseId = new ThreadLocal();
  -
  -   public static Object getPhaseId()
  -   {
  -      return phaseId.get();
  -   }
  -
  -   static void setPhaseId(Object phase)
  -   {
  -      phaseId.set(phase);
  -   }
      
      public static Map<String, Object> getApplication() 
      {