axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis/encoding/ser BaseFactory.java BaseDeserializerFactory.java BaseSerializerFactory.java
Date Thu, 01 May 2003 17:05:52 GMT
dims        2003/05/01 10:05:52

  Modified:    java/src/org/apache/axis/encoding/ser
                        BaseDeserializerFactory.java
                        BaseSerializerFactory.java
  Added:       java/src/org/apache/axis/encoding/ser BaseFactory.java
  Log:
  Fix for Bug 19080 - Performance bottleneck in BaseDeserializerFactory.getDeserializerMethod()
  
  Notes:
  - Both getDeserializerMethod and getSerializerMethod are now cached in BaseFactory.
  
  Revision  Changes    Path
  1.14      +2 -53     xml-axis/java/src/org/apache/axis/encoding/ser/BaseDeserializerFactory.java
  
  Index: BaseDeserializerFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/BaseDeserializerFactory.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- BaseDeserializerFactory.java	28 Apr 2003 12:44:07 -0000	1.13
  +++ BaseDeserializerFactory.java	1 May 2003 17:05:51 -0000	1.14
  @@ -77,7 +77,7 @@
    *
    * @author Rich Scheuerle <scheu@us.ibm.com>
    */
  -public abstract class BaseDeserializerFactory 
  +public abstract class BaseDeserializerFactory extends BaseFactory 
       implements DeserializerFactory {
   
       transient static Vector mechanisms = null;
  @@ -88,7 +88,6 @@
       
       transient protected Constructor deserClassConstructor = null;
       transient protected Method getDeserializer = null;
  -    transient protected ThreadLocal methodCache = new ThreadLocal();
   
       /**
        * Constructor
  @@ -188,56 +187,6 @@
       }
   
       /**
  -     * Returns the per thread hashmap (for method caching)  
  -     */
  -    private Map getMethodCache() {
  -        Map map = (Map)methodCache.get();
  -        if(map == null) {
  -            map = new HashMap();
  -            methodCache.set(map);
  -        }
  -        return map;
  -    }
  -    
  -    /**
  -     * Returns the "getDeserializer" method if any.
  -     */
  -    private Method getDeserializerMethod(Class clazz) {
  -        String className = clazz.getName();
  -        Map cache = getMethodCache();
  -        Method method = null;
  -        
  -        // Check the cache first.
  -        if(cache.containsKey(className)) {
  -            method = (Method) cache.get(clazz);
  -            return method;
  -        }
  -        
  -        try {
  -            method = 
  -                clazz.getMethod("getDeserializer",
  -                                   new Class[] {String.class, 
  -                                                Class.class, 
  -                                                QName.class});
  -        } catch (NoSuchMethodException e) {}
  -        if (method == null) {
  -            try {
  -                Class helper = ClassUtils.forName(
  -                    clazz.getName() + "_Helper");
  -                method =
  -                    helper.getMethod("getDeserializer", 
  -                                     new Class[] {String.class, 
  -                                                  Class.class, 
  -                                                  QName.class});
  -            } catch (NoSuchMethodException e) {
  -            } catch (ClassNotFoundException e) {}
  -        }
  -        
  -        cache.put(className, method);
  -        return method;
  -    }
  -    
  -    /**
        * Returns a list of all XML processing mechanism types supported by this DeserializerFactory.
        *
        * @return List of unique identifiers for the supported XML processing mechanism types
  @@ -312,7 +261,7 @@
   	 */
   	protected Method getGetDeserializer() {
   		if (getDeserializer == null) {
  -            getDeserializer = getDeserializerMethod(javaType);    
  +            getDeserializer = getMethod(javaType,"getDeserializer");    
   		}
   		return getDeserializer;
   	}
  
  
  
  1.23      +2 -30     xml-axis/java/src/org/apache/axis/encoding/ser/BaseSerializerFactory.java
  
  Index: BaseSerializerFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/BaseSerializerFactory.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- BaseSerializerFactory.java	22 Apr 2003 19:34:27 -0000	1.22
  +++ BaseSerializerFactory.java	1 May 2003 17:05:51 -0000	1.23
  @@ -75,7 +75,7 @@
    *
    * @author Rich Scheuerle <scheu@us.ibm.com>
    */
  -public abstract class BaseSerializerFactory 
  +public abstract class BaseSerializerFactory extends BaseFactory
       implements SerializerFactory {
   
       transient static Vector mechanisms = null;
  @@ -192,34 +192,6 @@
       }
   
       /**
  -     * Returns the "getSerializer" method if any.
  -     */
  -    private Method getSerializerMethod(Class clazz) {
  -        Method method = null;
  -        try {
  -            method = 
  -                clazz.getMethod("getSerializer",
  -                                   new Class[] {String.class, 
  -                                                Class.class, 
  -                                                QName.class});
  -        } catch (NoSuchMethodException e) {}
  -        
  -        if (method == null) {
  -            try {
  -                Class helper = ClassUtils.forName(
  -                    clazz.getName() + "_Helper");
  -                method =
  -                    helper.getMethod("getSerializer", 
  -                                     new Class[] {String.class, 
  -                                                  Class.class, 
  -                                                  QName.class});
  -            } catch (NoSuchMethodException e) {
  -            } catch (ClassNotFoundException e) {}
  -        }
  -        return method;
  -    }
  -
  -    /**
        * Returns a list of all XML processing mechanism types supported
        * by this SerializerFactory.
        *
  @@ -305,7 +277,7 @@
   	 */
   	protected Method getGetSerializer() {
   		if (getSerializer == null) {
  -            getSerializer = getSerializerMethod(javaType);
  +            getSerializer = getMethod(javaType, "getSerializer");
   		}
   		return getSerializer;
   	}
  
  
  
  1.1                  xml-axis/java/src/org/apache/axis/encoding/ser/BaseFactory.java
  
  Index: BaseFactory.java
  ===================================================================
  /*
   * The Apache Software License, Version 1.1
   *
   *
   * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Axis" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  package org.apache.axis.encoding.ser;
  
  import org.apache.axis.utils.ClassUtils;
  
  import javax.xml.namespace.QName;
  import java.util.Map;
  import java.util.HashMap;
  import java.lang.reflect.Method;
  
  /**
   * Base Factory for BaseDeserializerFactory and BaseSerializerFactory.
   * Code Reuse for the method cache
   * 
   * @author Davanum Srinivas <dims@yahoo.com> 
   */
  public abstract class BaseFactory {
      /**
       * Cache for Methods
       */
      transient protected ThreadLocal methodCache = new ThreadLocal();
  
      /**
       * Returns the per thread hashmap (for method caching)  
       */
      private Map getMethodCache() {
          Map map = (Map) methodCache.get();
          if (map == null) {
              map = new HashMap();
              methodCache.set(map);
          }
          return map;
      }
  
      /**
       * Returns the the specified method - if any.
       */
      protected Method getMethod(Class clazz, String methodName) {
          String className = clazz.getName();
          Map cache = getMethodCache();
          Method method = null;
          
          // Check the cache first.
          if (cache.containsKey(className)) {
              method = (Method) cache.get(clazz);
              return method;
          }
          try {
              method = clazz.getMethod(methodName, new Class[]{String.class, Class.class,
QName.class});
          } catch (NoSuchMethodException e) {
          }
          if (method == null) {
              try {
                  Class helper = ClassUtils.forName(clazz.getName() + "_Helper");
                  method = helper.getMethod(methodName, new Class[]{String.class, Class.class,
QName.class});
              } catch (NoSuchMethodException e) {
              } catch (ClassNotFoundException e) {
              }
          }
          cache.put(className, method);
          return method;
      }
  }
  
  
  

Mime
View raw message