Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

bug fixed Logging error on osgi

Browse Source
This commit is contained in:
wenshao
2013-05-01 15:49:58 +08:00
parent 7e3b565236
commit 18d7bd0e3b
2 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/support/logging/LogFactory.java
+4 -7
View File
@@ -51,13 +51,10 @@ public class LogFactory {
Resources.classForName(testClassName);
Class implClass = Resources.classForName(implClassName);
logConstructor = implClass.getConstructor(new Class[] { Class.class });
{
Class<?> declareClass = logConstructor.getDeclaringClass();
if (!Log.class.isAssignableFrom(declareClass)) {
logConstructor = null;
} else {
return;
}
Class<?> declareClass = logConstructor.getDeclaringClass();
if (!Log.class.isAssignableFrom(declareClass)) {
logConstructor = null;
}
} catch (Throwable t) {
t.printStackTrace();
src/test/java/com/alibaba/druid/bvt/log/LoggerTest.java
+17 -10
View File
@@ -19,8 +19,9 @@ import com.alibaba.druid.util.JdbcUtils;
public class LoggerTest extends TestCase {
private static java.security.ProtectionDomain DOMAIN;
private DruidDataSource dataSource;
private ClassLoader contextClassLoader;
private DruidDataSource dataSource;
static {
DOMAIN = (java.security.ProtectionDomain) java.security.AccessController.doPrivileged(new PrivilegedAction<Object>() {
@@ -34,18 +35,18 @@ public class LoggerTest extends TestCase {
public static class TestLoader extends ClassLoader {
private ClassLoader loader;
private Set<String> definedSet = new HashSet<String>();
public TestLoader(){
super(null);
loader = DruidDriver.class.getClassLoader();
}
public URL getResource(String name) {
return loader.getResource(name);
}
public Enumeration<URL> getResources(String name) throws IOException {
return loader.getResources(name);
}
@@ -54,11 +55,11 @@ public class LoggerTest extends TestCase {
if (name.startsWith("java")) {
return loader.loadClass(name);
}
if (definedSet.contains(name)) {
return super.loadClass(name);
}
String resourceName = name.replace('.', '/') + ".class";
InputStream is = loader.getResourceAsStream(resourceName);
if (is == null) {
@@ -77,9 +78,9 @@ public class LoggerTest extends TestCase {
// TODO Auto-generated catch block
e.printStackTrace();
}
Class<?> clazz = super.loadClass(name);
return clazz;
}
}
@@ -94,9 +95,15 @@ public class LoggerTest extends TestCase {
Connection conn = dataSource.getConnection();
conn.close();
}
@Override
protected void setUp() throws Exception {
contextClassLoader = Thread.currentThread().getContextClassLoader();
}
@Override
protected void tearDown() throws Exception {
Thread.currentThread().setContextClassLoader(contextClassLoader);
JdbcUtils.close(dataSource);
}
}