Author: kkolinko
Date: Sun Aug 10 21:23:57 2014
New Revision: 1617165
URL: http://svn.apache.org/r1617165
Log:
Review of r1616584
- Explicitly reference the classloader of PoolProperties class, to keep the old
behaviour of Class.forName.
It matters in unlikely theoretical case if PoolProperties$InterceptorDefinition
class is being extended (subclassed).
- s/StringBuffer/StringBuilder/
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ClassLoaderUtil.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.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=1617165&r1=1617164&r2=1617165&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
Sun Aug 10 21:23:57 2014
@@ -28,7 +28,7 @@ public class ClassLoaderUtil {
public static Class<?> loadClass(String className, ClassLoader...
classLoaders) throws ClassNotFoundException {
ClassNotFoundException last = null;
- StringBuffer errorMsg = null;
+ StringBuilder errorMsg = null;
for (ClassLoader cl : classLoaders) {
try {
if (cl!=null) {
@@ -42,9 +42,9 @@ public class ClassLoaderUtil {
} catch (ClassNotFoundException x) {
last = x;
if (errorMsg==null) {
- errorMsg = new StringBuffer();
+ errorMsg = new StringBuilder();
} else {
- errorMsg.append(";");
+ errorMsg.append(';');
}
errorMsg.append("ClassLoader:");
errorMsg.append(cl);
@@ -53,7 +53,7 @@ public class ClassLoaderUtil {
break;
}
}
- throw new ClassNotFoundException("Unable to load class:"+className+"
from "+errorMsg, last);
+ throw new ClassNotFoundException("Unable to load class: "+className+"
from "+errorMsg, last);
}
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=1617165&r1=1617164&r2=1617165&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
Sun Aug 10 21:23:57 2014
@@ -963,7 +963,7 @@ public class PoolProperties implements P
}
clazz = ClassLoaderUtil.loadClass(
PoolConfiguration.PKG_PREFIX+getClassName(),
- this.getClass().getClassLoader(),
+ PoolProperties.class.getClassLoader(),
Thread.currentThread().getContextClassLoader()
);
} else {
@@ -972,7 +972,7 @@ public class PoolProperties implements P
}
clazz = ClassLoaderUtil.loadClass(
getClassName(),
- this.getClass().getClassLoader(),
+ PoolProperties.class.getClassLoader(),
Thread.currentThread().getContextClassLoader()
);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
