From faad9125b4205cd60c1bb613b1bd51abe4c918da Mon Sep 17 00:00:00 2001
From: wentch <22250530@qq.com>
Date: Mon, 28 Dec 2015 16:31:13 +0800
Subject: [PATCH]

---
 src/org/redkale/source/DataConnection.java    | 44 ++++++++++++----
 src/org/redkale/source/DataDefaultSource.java | 52 +------------------
 2 files changed, 37 insertions(+), 59 deletions(-)

diff --git a/src/org/redkale/source/DataConnection.java b/src/org/redkale/source/DataConnection.java
index 83fab205a..912fd4d0e 100644
--- a/src/org/redkale/source/DataConnection.java
+++ b/src/org/redkale/source/DataConnection.java
@@ -5,26 +5,52 @@
  */
 package org.redkale.source;
 
+import java.sql.*;
+
 /**
  *
  * @see http://www.redkale.org
  * @author zhangjx
  */
-public abstract class DataConnection {
+public class DataConnection {
 
-    private final Object connection;
+    private final Connection conn;
 
-    protected DataConnection(Object connection) {
-        this.connection = connection;
+    protected DataConnection(Connection connection) {
+        this.conn = connection;
     }
 
-    protected <T> T getConnection() {
-        return (T) this.connection;
+    protected Connection getConnection() {
+        return this.conn;
     }
 
-    public abstract boolean commit();
+    public boolean close() {
+        try {
+            if (conn == null || conn.isClosed()) return true;
+            conn.close();
+            return true;
+        } catch (Exception e) {
+            //do nothing
+            return false;
+        }
+    }
 
-    public abstract boolean rollback();
+    public boolean commit() {
+        try {
+            conn.commit();
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
 
-    public abstract boolean close();
+    public boolean rollback() {
+        try {
+            conn.rollback();
+            return true;
+        } catch (Exception e) {
+            //do nothing
+            return false;
+        }
+    }
 }
diff --git a/src/org/redkale/source/DataDefaultSource.java b/src/org/redkale/source/DataDefaultSource.java
index 7f9751325..79f80b7f8 100644
--- a/src/org/redkale/source/DataDefaultSource.java
+++ b/src/org/redkale/source/DataDefaultSource.java
@@ -69,54 +69,6 @@ public final class DataDefaultSource implements DataSource, Function<Class, Enti
     @Resource(name = "$")
     private DataCacheListener cacheListener;
 
-    private static class DataJDBCConnection extends DataConnection {
-
-        private final Connection sqlconn;
-
-        private DataJDBCConnection(Connection c) {
-            super(c);
-            this.sqlconn = c;
-            try {
-                this.sqlconn.setAutoCommit(true);
-            } catch (Exception e) {
-                //do nothing
-            }
-        }
-
-        @Override
-        public boolean close() {
-            try {
-                if(sqlconn == null || sqlconn.isClosed()) return true;
-                sqlconn.close();
-                return true;
-            } catch (Exception e) {
-                //do nothing
-                return false;
-            }
-        }
-
-        @Override
-        public boolean commit() {
-            try {
-                sqlconn.commit();
-                return true;
-            } catch (Exception e) {
-                return false;
-            }
-        }
-
-        @Override
-        public boolean rollback() {
-            try {
-                sqlconn.rollback();
-                return true;
-            } catch (Exception e) {
-                //do nothing
-                return false;
-            }
-        }
-    }
-
     private final Function<Class, List> fullloader = (t) -> querySheet(false, false, t, null, null, (FilterNode) null).list(true);
 
     public DataDefaultSource() throws IOException {
@@ -276,12 +228,12 @@ public final class DataDefaultSource implements DataSource, Function<Class, Enti
 
     @Override
     public DataConnection createReadConnection() {
-        return new DataJDBCConnection(createReadSQLConnection());
+        return new DataConnection(createReadSQLConnection());
     }
 
     @Override
     public DataConnection createWriteConnection() {
-        return new DataJDBCConnection(createWriteSQLConnection());
+        return new DataConnection(createWriteSQLConnection());
     }
 
     @Override