Author: markt Date: Fri Aug 8 14:02:40 2014 New Revision: 1616759 URL: http://svn.apache.org/r1616759 Log: Fix possible NPE highlighted by Eclipse
Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ClassLoaderUtil.java Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ClassLoaderUtil.java URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ClassLoaderUtil.java?rev=1616759&r1=1616758&r2=1616759&view=diff ============================================================================== --- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ClassLoaderUtil.java (original) +++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ClassLoaderUtil.java Fri Aug 8 14:02:40 2014 @@ -22,11 +22,11 @@ import org.apache.juli.logging.LogFactor public class ClassLoaderUtil { private static final Log log = LogFactory.getLog(ClassLoaderUtil.class); - - private static final boolean onlyAttemptFirstLoader = - Boolean.getBoolean(System.getProperty("org.apache.tomcat.jdbc.pool.onlyAttemptCurrentClassLoader", "false")); - - public static Class loadClass(String className, ClassLoader... classLoaders) throws ClassNotFoundException { + + private static final boolean onlyAttemptFirstLoader = + Boolean.getBoolean(System.getProperty("org.apache.tomcat.jdbc.pool.onlyAttemptCurrentClassLoader", "false")); + + public static Class<?> loadClass(String className, ClassLoader... classLoaders) throws ClassNotFoundException { ClassNotFoundException last = null; StringBuffer errorMsg = null; for (ClassLoader cl : classLoaders) { @@ -47,7 +47,11 @@ public class ClassLoaderUtil { errorMsg.append(";"); } errorMsg.append("ClassLoader:"); - errorMsg.append(cl.toString()); + if (cl == null) { + errorMsg.append("null"); + } else { + errorMsg.append(cl.toString()); + } } if (onlyAttemptFirstLoader) { break; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org