修复连接不能正确释放的问题

zhanyingf15 · Aug 4, 2017 · 912d50e · 912d50e
1 parent f0783f6
commit 912d50e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.wjj</groupId>
   <artifactId>elasticsearch-jdbc</artifactId>
   <packaging>jar</packaging>
-  <version>2.0.0</version>
+  <version>2.0.1</version>
   <name>elasticsearch-jdbc</name>
   <url>http://maven.apache.org</url>
 

diff --git a/src/main/java/com/alibaba/druid/pool/MybatisElasticSearchConnection.java b/src/main/java/com/alibaba/druid/pool/MybatisElasticSearchConnection.java
@@ -27,6 +27,7 @@ public MybatisElasticSearchConnection(String jdbcUrl){
     public void close() throws SQLException {
         this.getClient().close();
         logger.info("关闭连接");
+        System.err.println("connection close:"+Thread.currentThread().getName());
     }
     @Override
     public DatabaseMetaData getMetaData() throws SQLException {

diff --git a/src/main/java/com/alibaba/druid/pool/MybatisElasticSearchDruidPooledConnection.java b/src/main/java/com/alibaba/druid/pool/MybatisElasticSearchDruidPooledConnection.java
@@ -82,9 +82,9 @@ private void initStatement(PreparedStatementHolder stmtHolder) throws SQLExcepti
         stmtHolder.incrementInUseCount();
         holder.getDataSource().initStatement(this, stmtHolder.getStatement());
     }
-    @Override
+    /*@Override
     public void close() throws SQLException {
-        if (isDisable()) {
+        *//*if (isDisable()) {
             return;
         }
         if(this.holder==null){
@@ -97,7 +97,11 @@ public void close() throws SQLException {
             psh.getStatement().close();
         }
         this.holder.setDiscard(true);
-        this.getConnection().close();
-    }
+        this.getConnection().close();*//*
+        super.close();
+//        DruidAbstractDataSource dataSource = holder.getDataSource();
+        System.err.println("close:"+Thread.currentThread().getName());
+//        System.err.println("active:"+dataSource.getActiveConnections().size());
+    }*/
 
 }