svn commit: r899132 - in /camel/trunk/camel-core/src/main/java/org/apache/camel: converter/jaxp/XmlConverter.java util/ObjectHelper.java

[ni...@apache.org]

Author: ningjiang
Date: Thu Jan 14 09:29:13 2010
New Revision: 899132

URL: http://svn.apache.org/viewvc?rev=899132&view=rev
Log:
CAMEL-2359 removed the warning message of XmlConverter

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java?rev=899132&r1=899131&r2=899132&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java Thu Jan 14 09:29:13 2010
@@ -78,7 +78,8 @@
     static {
         Class<?> cl = null;
         try {
-            cl = ObjectHelper.loadClass("org.apache.xalan.xsltc.trax.DOM2SAX");
+            // will not warn the user if the class could not be found
+            cl = ObjectHelper.loadClass("org.apache.xalan.xsltc.trax.DOM2SAX", XmlConverter.class.getClassLoader(), false);
         } catch (Exception e) {
             // ignore
         }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java?rev=899132&r1=899131&r2=899132&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java Thu Jan 14 09:29:13 2010
@@ -598,7 +598,7 @@
     public static Class<?> loadClass(String name) {
         return loadClass(name, ObjectHelper.class.getClassLoader());
     }
-
+    
     /**
      * Attempts to load the given class name using the thread context class
      * loader or the given class loader
@@ -609,6 +609,20 @@
      * @return the class or null if it could not be loaded
      */
     public static Class<?> loadClass(String name, ClassLoader loader) {
+        return loadClass(name, loader, true);
+    }
+
+    /**
+     * Attempts to load the given class name using the thread context class
+     * loader or the given class loader
+     *
+     * @param name the name of the class to load
+     * @param loader the class loader to use after the thread context class
+     *                loader
+     * @param needToWarn if it is true will use log a warning message for not loading the class               
+     * @return the class or null if it could not be loaded
+     */
+    public static Class<?> loadClass(String name, ClassLoader loader, boolean needToWarn) {
         // must clean the name so its pure java name, eg remoing \n or whatever people can do in the Spring XML
         name = normalizeClassName(name);
 
@@ -631,7 +645,9 @@
         }
 
         if (clazz == null) {
-            LOG.warn("Cannot find class: " + name);
+            if (needToWarn) {
+                LOG.warn("Cannot find class: " + name);
+            }
         }
 
         return clazz;