epugh       2004/11/01 12:08:41

  Modified:    src/java/org/apache/turbine/pipeline
                        DefaultSessionTimeoutValve.java
                        DefaultACLCreationValve.java
                        DefaultSessionValidationValve.java
                        DefaultTargetValve.java
  Log:
  Move initialization stuff into the initiazie method..
  
  Revision  Changes    Path
  1.10      +14 -5     
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultSessionTimeoutValve.java
  
  Index: DefaultSessionTimeoutValve.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultSessionTimeoutValve.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DefaultSessionTimeoutValve.java   31 Jan 2004 01:34:50 -0000      1.9
  +++ DefaultSessionTimeoutValve.java   1 Nov 2004 20:08:41 -0000       1.10
  @@ -84,17 +84,26 @@
       public DefaultSessionTimeoutValve()
           throws Exception
       {
  +
  +    }
  +    
  +    
  +
  +    /* (non-Javadoc)
  +     * @see org.apache.turbine.Valve#initialize()
  +     */
  +    public void initialize() throws Exception {
  +        super.initialize();
           Configuration cfg = Turbine.getConfiguration();
           if (cfg != null)
           {
               // Get the session timeout.  Use String so we know whether
               // the timeout was specified or not.
  -             if(cfg.containsKey(SESSION_TIMEOUT)){
  -                     timeout = Integer.valueOf(cfg.getString(SESSION_TIMEOUT));
  -             }
  +            if(cfg.containsKey(SESSION_TIMEOUT)){
  +                timeout = Integer.valueOf(cfg.getString(SESSION_TIMEOUT));
  +            }
           }
       }
  -
       /**
        * @see org.apache.turbine.Valve#invoke(RunData, ValveContext)
        */
  
  
  
  1.7       +11 -3     
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultACLCreationValve.java
  
  Index: DefaultACLCreationValve.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultACLCreationValve.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultACLCreationValve.java      23 Nov 2003 00:42:22 -0000      1.6
  +++ DefaultACLCreationValve.java      1 Nov 2004 20:08:41 -0000       1.7
  @@ -85,6 +85,15 @@
       public DefaultACLCreationValve()
           throws Exception
       {
  +
  +    }
  +
  +    
  +    /* (non-Javadoc)
  +     * @see org.apache.turbine.Valve#initialize()
  +     */
  +    public void initialize() throws Exception {
  +        super.initialize();
           Resolver r = Turbine.getResolver();
           if (r != null)
           {
  @@ -92,9 +101,8 @@
               accessController = (AccessController)
                   r.getModule(ACTIONS, Turbine.getConfiguration()
                       .getString(ACTION_ACCESS_CONTROLLER));
  -        }
  +        }        
       }
  -
       /**
        * @see org.apache.turbine.Valve#invoke(RunData, ValveContext)
        */
  
  
  
  1.7       +12 -3     
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultSessionValidationValve.java
  
  Index: DefaultSessionValidationValve.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultSessionValidationValve.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultSessionValidationValve.java        23 Nov 2003 00:42:22 -0000      1.6
  +++ DefaultSessionValidationValve.java        1 Nov 2004 20:08:41 -0000       1.7
  @@ -85,6 +85,16 @@
       public DefaultSessionValidationValve()
           throws Exception
       {
  +        
  +    }
  +    
  +    
  +
  +    /* (non-Javadoc)
  +     * @see org.apache.turbine.Valve#initialize()
  +     */
  +    public void initialize() throws Exception {
  +        super.initialize();
           Resolver r = Turbine.getResolver();
           if (r != null)
           {
  @@ -92,9 +102,8 @@
               sessionValidator = (SessionValidator)
                   r.getModule(ACTIONS, Turbine.getConfiguration()
                       .getString(ACTION_SESSION_VALIDATOR));
  -        }
  +        }        
       }
  -
       /**
        * @see org.apache.turbine.Valve#invoke(RunData, ValveContext)
        */
  
  
  
  1.19      +10 -2     
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultTargetValve.java
  
  Index: DefaultTargetValve.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultTargetValve.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- DefaultTargetValve.java   23 Nov 2003 00:42:22 -0000      1.18
  +++ DefaultTargetValve.java   1 Nov 2004 20:08:41 -0000       1.19
  @@ -94,6 +94,15 @@
        */
       public DefaultTargetValve()
       {
  +
  +    }
  +    
  +    
  +
  +    /* (non-Javadoc)
  +     * @see org.apache.turbine.Valve#initialize()
  +     */
  +    public void initialize() throws Exception {
           Configuration cfg = Turbine.getConfiguration();
   
           if (cfg != null)
  @@ -104,7 +113,6 @@
                                 DEFAULT_MODULE_TYPE);
           }
       }
  -
       /**
        * @see org.apache.turbine.Valve#invoke(RunData, ValveContext)
        */
  
  
  

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

Reply via email to