cvs commit: xml-axis/java/src/org/apache/axis/configuration EngineConfigurationFactoryFinder.java

[dims]

dims        2002/10/01 07:33:45

  Modified:    java/src/org/apache/axis/configuration
                        EngineConfigurationFactoryFinder.java
  Log:
  Hopefully final patch for Bug# 13149....If the servlet.jar is present at 
compile-time and absent at run-time don't use log.warn use log.debug as we should fall 
back to the EngineConfigurationFactoryDefault silently under "normal client-side" 
conditions.
  
  Revision  Changes    Path
  1.18      +11 -2     
xml-axis/java/src/org/apache/axis/configuration/EngineConfigurationFactoryFinder.java
  
  Index: EngineConfigurationFactoryFinder.java
  ===================================================================
  RCS file: 
/home/cvs/xml-axis/java/src/org/apache/axis/configuration/EngineConfigurationFactoryFinder.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- EngineConfigurationFactoryFinder.java     1 Oct 2002 13:35:57 -0000       1.17
  +++ EngineConfigurationFactoryFinder.java     1 Oct 2002 14:33:45 -0000       1.18
  @@ -56,6 +56,7 @@
   package org.apache.axis.configuration;
   
   import java.lang.reflect.Method;
  +import java.lang.reflect.InvocationTargetException;
   import java.security.AccessController;
   import java.security.PrivilegedAction;
   
  @@ -224,8 +225,16 @@
           } else {
               try {
                   return (EngineConfigurationFactory)method.invoke(null, param);
  -            } catch (NoClassDefFoundError e) {
  -                //Ignore if servlet classes are not in classpath.
  +            } catch (InvocationTargetException e) {
  +                if (e.getTargetException() instanceof 
java.lang.NoClassDefFoundError) {
  +                    log.debug(Messages.getMessage("engineConfigInvokeNewFactory",
  +                                                  service.getName(),
  +                                                  requiredMethod), e);
  +                } else {
  +                    log.warn(Messages.getMessage("engineConfigInvokeNewFactory",
  +                                                  service.getName(),
  +                                                  requiredMethod), e);
  +                }
               } catch (Exception e) {
                   log.warn(Messages.getMessage("engineConfigInvokeNewFactory",
                                                 service.getName(),