axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: ws-axis/java/src/org/apache/axis/configuration EngineConfigurationFactoryServlet.java
Date Wed, 02 Feb 2005 13:39:08 GMT
dims        2005/02/02 05:39:08

  Modified:    java/src/org/apache/axis/configuration
                        EngineConfigurationFactoryServlet.java
  Log:
  Fix for AXIS-1798 - Multiple AxisServers per ServletContext - suggested EngineConfigurationFactoryServlet
changes
  from Clive Brettingham-Moore (apache@brettingham-moore.net)
  
  URL: http://issues.apache.org/jira/browse/AXIS-1798
  
  Revision  Changes    Path
  1.25      +11 -6     ws-axis/java/src/org/apache/axis/configuration/EngineConfigurationFactoryServlet.java
  
  Index: EngineConfigurationFactoryServlet.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/configuration/EngineConfigurationFactoryServlet.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- EngineConfigurationFactoryServlet.java	25 Feb 2004 14:02:33 -0000	1.24
  +++ EngineConfigurationFactoryServlet.java	2 Feb 2005 13:39:08 -0000	1.25
  @@ -51,7 +51,7 @@
       protected static Log log =
           LogFactory.getLog(EngineConfigurationFactoryServlet.class.getName());
   
  -    private ServletContext ctx;
  +    private ServletConfig cfg;
       
       /**
        * Creates and returns a new EngineConfigurationFactory.
  @@ -87,7 +87,7 @@
        */
       protected EngineConfigurationFactoryServlet(ServletConfig conf) {
           super();
  -        this.ctx = conf.getServletContext();
  +        this.cfg = conf;
       }
   
       /**
  @@ -96,7 +96,7 @@
        * @return a server EngineConfiguration
        */
       public EngineConfiguration getServerEngineConfig() {
  -        return getServerEngineConfig(ctx);
  +        return getServerEngineConfig(cfg);
       }
   
       /**
  @@ -106,10 +106,15 @@
        * @return a server EngineConfiguration
        */
       private static 
  -            EngineConfiguration getServerEngineConfig(ServletContext ctx) {
  +            EngineConfiguration getServerEngineConfig(ServletConfig cfg) {
  +        
  +        ServletContext ctx = cfg.getServletContext();
  +        
           // Respect the system property setting for a different config file
  -        String configFile = 
  -                AxisProperties.getProperty(OPTION_SERVER_CONFIG_FILE);
  +        String configFile = cfg.getInitParameter(OPTION_SERVER_CONFIG_FILE);
  +        if (configFile == null)
  +                configFile = 
  +                        AxisProperties.getProperty(OPTION_SERVER_CONFIG_FILE);
           if (configFile == null) {
               configFile = SERVER_CONFIG_FILE;
           }
  
  
  

Mime
View raw message