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

testcase fixed

Browse Source
This commit is contained in:
wenshao
2012-07-26 15:18:08 +08:00
parent c2363653a5
commit 6dd3f66c3b
42 changed files with 70 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java
+14 -10
View File
@@ -15,6 +15,7 @@
*/
package com.alibaba.druid.pool;
import java.lang.ref.WeakReference;
import java.sql.Array;
import java.sql.Blob;
import java.sql.CallableStatement;
@@ -54,18 +55,19 @@ import com.alibaba.druid.support.logging.LogFactory;
*/
public class DruidPooledConnection implements javax.sql.PooledConnection, Connection {
private final static Log LOG = LogFactory.getLog(DruidPooledConnection.class);
private final static Log LOG = LogFactory.getLog(DruidPooledConnection.class);
protected Connection conn;
protected ConnectionHolder holder;
protected TransactionInfo transactionInfo;
private final boolean dupCloseLogEnable;
private boolean traceEnable = false;
private boolean diable = false;
private boolean closed = false;
private final Thread ownerThread;
protected Connection conn;
protected ConnectionHolder holder;
protected TransactionInfo transactionInfo;
private final boolean dupCloseLogEnable;
private boolean traceEnable = false;
private boolean diable = false;
private boolean closed = false;
private final Thread ownerThread;
private WeakReference<Thread> closedThreadRef = null;
private long connectedTimeNano;
private long connectedTimeNano;
public DruidPooledConnection(ConnectionHolder holder){
this.conn = holder.getConnection();
@@ -178,6 +180,8 @@ public class DruidPooledConnection implements javax.sql.PooledConnection, Connec
LOG.error("dup close");
return;
}
closedThreadRef = new WeakReference<Thread>(Thread.currentThread());
for (ConnectionEventListener listener : holder.getConnectionEventListeners()) {
listener.connectionClosed(new ConnectionEvent(this));
src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java
+16
View File
@@ -54,6 +54,22 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe
public static DruidDataSourceStatManager getInstance() {
return instance;
}
public static void cear() {
MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
for (Map.Entry<DruidDataSource, ObjectName> entry : dataSources.entrySet()) {
ObjectName objectName = entry.getValue();
if (objectName == null) {
continue;
}
try {
mbeanServer.unregisterMBean(objectName);
} catch (JMException e) {
LOG.error(e.getMessage(), e);
}
}
dataSources.clear();
}
public synchronized static ObjectName add(DruidDataSource dataSource, String name) {
MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();