cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/rundata TurbineRunDataService.java

[jvanzyl]

jvanzyl     01/06/14 07:43:04

  Modified:    src/java/org/apache/turbine/services/rundata
                        TurbineRunDataService.java
  Log:
  - updating service as per notes.
  
  Revision  Changes    Path
  1.4       +6 -10     
jakarta-turbine/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java
  
  Index: TurbineRunDataService.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TurbineRunDataService.java        2001/04/08 16:39:07     1.3
  +++ TurbineRunDataService.java        2001/06/14 14:43:03     1.4
  @@ -64,15 +64,13 @@
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
   
  -import org.apache.velocity.runtime.configuration.Configuration;
  -
   import org.apache.turbine.util.RunData;
   import org.apache.turbine.util.CookieParser;
   import org.apache.turbine.util.ParameterParser;
   import org.apache.turbine.util.ServerData;
   import org.apache.turbine.util.TurbineException;
   import org.apache.turbine.services.TurbineServices;
  -import org.apache.turbine.services.TurbineBaseService;
  +import org.apache.turbine.services.BaseService;
   import org.apache.turbine.services.InitializationException;
   import org.apache.turbine.services.pool.PoolService;
   
  @@ -84,10 +82,10 @@
    * the implementations should implement the Recyclable interface.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Ilkka Priha</a>
  - * @version $Id: TurbineRunDataService.java,v 1.3 2001/04/08 16:39:07 ilkka Exp $
  + * @version $Id: TurbineRunDataService.java,v 1.4 2001/06/14 14:43:03 jvanzyl Exp $
    */
   public class TurbineRunDataService 
  -    extends TurbineBaseService
  +    extends BaseService
       implements RunDataService
   {
       /**
  @@ -161,9 +159,7 @@
           };
           configurations.put(DEFAULT_CONFIG,def.clone());
   
  -        // Check other configurations.
  -        Configuration conf = getConfiguration();
  -        if (conf != null)
  +        if (getConfiguration() != null)
           {
               String key,value;
               String[] config;
  @@ -173,10 +169,10 @@
                   PARAMETER_PARSER,
                   COOKIE_PARSER
               };
  -            for (Iterator i = conf.getKeys(); i.hasNext();)
  +            for (Iterator i = getConfiguration().getKeys(); i.hasNext();)
               {
                   key = (String) i.next();
  -                value = conf.getString(key);
  +                value = getConfiguration().getString(key);
                   for (int j = 0; j < plist.length; j++)
                   {
                       if (key.endsWith(plist[j]) &&
  
  
  

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