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

Merge remote-tracking branch 'zhb/master'

Browse Source
This commit is contained in:
zhouhaibin
2012-08-10 15:22:07 +08:00
parent 48befaf00d 106bdf9af8
commit dc9d348ee2
3 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+4 -3
View File
@@ -316,9 +316,10 @@
<version>11.2.0.3</version> <scope>provided</scope> </dependency> -->
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc14</artifactId>
<version>10.2.0.2.0</version>
<groupId>com.oracle</groupId>
<artifactId>ojdbc14</artifactId>
<version>10.2.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
src/main/java/com/alibaba/druid/stat/DruidDataSourceStatJNDIStatStrategy.java
+11 -1
View File
@@ -3,12 +3,22 @@ package com.alibaba.druid.stat;
import java.util.List;
import java.util.Map;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.ReflectionUtils;
public class DruidDataSourceStatJNDIStatStrategy implements DruidDataSourceStatStrategy{
private final static Log LOG = LogFactory.getLog(DruidDataSourceStatJNDIStatStrategy.class);
private Object getStrategyB() {
return ReflectionUtils.getClassFromWebContainerOrCurrentClassLoader("com.alibaba.druid.stat.DruidDataSourceStatDefaultStrategy");
Class<?> clazz = ReflectionUtils.getClassFromWebContainerOrCurrentClassLoader("com.alibaba.druid.stat.DruidDataSourceStatDefaultStrategy");
Object object = null;
try {
object = clazz.newInstance();
} catch (Exception e) {
LOG.error(e.getMessage(), e);
}
return object;
}
@SuppressWarnings("unchecked")
src/main/java/com/alibaba/druid/util/ReflectionUtils.java
+12 -2
View File
@@ -42,10 +42,20 @@ public class ReflectionUtils {
}
}
public static Object callObjectMethod(Object obj, String methodName, Object... methodParams) {
public static Object callObjectMethod(Object obj, String methodName) {
try {
Method m = obj.getClass().getMethod(methodName);
return m.invoke(obj, methodParams);
return m.invoke(obj);
} catch (Exception e) {
LOG.warn("callObjectMethod fail:class=" + obj.getClass().getName() + " method=" + methodName, e);
return null;
}
}
public static Object callObjectMethod(Object obj, String methodName, Integer id) {
try {
Method m = obj.getClass().getMethod(methodName, Integer.class);
return m.invoke(obj, id);
} catch (Exception e) {
LOG.warn("callObjectMethod fail:class=" + obj.getClass().getName() + " method=" + methodName, e);
return null;