axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rsi...@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis/transport/http AxisServlet.java
Date Fri, 17 May 2002 18:19:39 GMT
rsitze      02/05/17 11:19:39

  Modified:    java/src/org/apache/axis/transport/http AxisServlet.java
  Log:
  Correct improper overload & use factory for hook as intended.
  
  Revision  Changes    Path
  1.102     +5 -11     xml-axis/java/src/org/apache/axis/transport/http/AxisServlet.java
  
  Index: AxisServlet.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/AxisServlet.java,v
  retrieving revision 1.101
  retrieving revision 1.102
  diff -u -r1.101 -r1.102
  --- AxisServlet.java	14 May 2002 23:24:03 -0000	1.101
  +++ AxisServlet.java	17 May 2002 18:19:39 -0000	1.102
  @@ -200,7 +200,8 @@
           if (context.getAttribute("AxisEngine") == null) {
               String webInfPath = context.getRealPath("/WEB-INF");
   
  -            EngineConfiguration config = getEngineConfig(context);
  +            EngineConfiguration config =
  +                (new ServletEngineConfigurationFactory(context)).getServerEngineConfig();
   
               Map environment = new HashMap();
               environment.put(AxisEngine.ENV_SERVLET_CONTEXT, context);
  @@ -489,8 +490,10 @@
           ServletContext context = config.getServletContext();
           res.setBufferSize(1024 * 8); //provide performance boost.       
   
  -        if (engine == null)
  +        if (engine == null) {
  +            log.debug("No engine, looking in servlet context");
               engine = (AxisEngine)context.getAttribute(AXIS_ENGINE);
  +        }
   
           if (engine == null) {
               // !!! should return a SOAP fault...
  @@ -684,14 +687,5 @@
        */
       protected String getDefaultJWSClassDir() {
           return getWebInfPath() + File.separator +  "jwsClasses";
  -    }
  -
  -    /**
  -     * Provided to allow overload of default engine config
  -     * by derived class.
  -     */
  -    protected static EngineConfiguration getEngineConfig(ServletContext context) {
  -        return (new ServletEngineConfigurationFactory(context)).
  -            getServerEngineConfig();
       }
   }
  
  
  

Mime
View raw message