You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by se...@apache.org on 2017/03/31 20:31:48 UTC
[1/3] incubator-trafodion git commit: Exception is thrown,
when using TrafT4DataSource in jdbcT4
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 29307b4c0 -> d0f60fa30
Exception is thrown, when using TrafT4DataSource in jdbcT4
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/ad20cf4d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/ad20cf4d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/ad20cf4d
Branch: refs/heads/master
Commit: ad20cf4dd388d3eafa040d33e587a55b940db2e5
Parents: 8691d78
Author: Kevin Xu <ka...@esgyn.cn>
Authored: Thu Mar 30 10:54:20 2017 +0800
Committer: Kevin Xu <ka...@esgyn.cn>
Committed: Thu Mar 30 10:54:20 2017 +0800
----------------------------------------------------------------------
.../java/org/trafodion/jdbc/t4/TrafT4PooledConnectionManager.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ad20cf4d/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PooledConnectionManager.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PooledConnectionManager.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PooledConnectionManager.java
index e31cd9d..b8d2879 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PooledConnectionManager.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PooledConnectionManager.java
@@ -147,6 +147,9 @@ public class TrafT4PooledConnectionManager implements javax.sql.ConnectionEventL
pc.close();
} catch (Exception e) {
} // cleanup, ignore any errors
+ if (removeInUseConnection(pc, false)) {
+ --count_;
+ }
}
}
}
[3/3] incubator-trafodion git commit: Merge [TRAFODION-2551] PR 1035
Exception is thrown, when using TrafT4DataSource in jdbcT4
Posted by se...@apache.org.
Merge [TRAFODION-2551] PR 1035 Exception is thrown, when using TrafT4DataSource in jdbcT4
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d0f60fa3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d0f60fa3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d0f60fa3
Branch: refs/heads/master
Commit: d0f60fa3015c52cfa02788ac6f2d05ed68f419f5
Parents: 29307b4 f4e4cde
Author: selvaganesang <se...@apache.org>
Authored: Fri Mar 31 20:30:35 2017 +0000
Committer: selvaganesang <se...@apache.org>
Committed: Fri Mar 31 20:30:35 2017 +0000
----------------------------------------------------------------------
.../org/trafodion/jdbc/t4/TrafT4PooledConnectionManager.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-trafodion git commit: Change Exception to SQLException
Posted by se...@apache.org.
Change Exception to SQLException
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/f4e4cde6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/f4e4cde6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/f4e4cde6
Branch: refs/heads/master
Commit: f4e4cde64ea8e1ed7a9a1cdac2728048175652ae
Parents: ad20cf4
Author: kevinxu021 <ka...@esgyn.cn>
Authored: Fri Mar 31 21:57:41 2017 +0800
Committer: kevinxu021 <ka...@esgyn.cn>
Committed: Fri Mar 31 21:57:41 2017 +0800
----------------------------------------------------------------------
.../org/trafodion/jdbc/t4/TrafT4PooledConnectionManager.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f4e4cde6/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PooledConnectionManager.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PooledConnectionManager.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PooledConnectionManager.java
index b8d2879..89c0889 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PooledConnectionManager.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PooledConnectionManager.java
@@ -129,7 +129,7 @@ public class TrafT4PooledConnectionManager implements javax.sql.ConnectionEventL
} catch (SQLException sqlEx) {
try {
pc.close();
- } catch (Exception e) {
+ } catch (SQLException e) {
} // cleanup, ignore any errors
}
} else {
@@ -145,7 +145,7 @@ public class TrafT4PooledConnectionManager implements javax.sql.ConnectionEventL
} catch (SQLException sqlEx) {
try {
pc.close();
- } catch (Exception e) {
+ } catch (SQLException e) {
} // cleanup, ignore any errors
if (removeInUseConnection(pc, false)) {
--count_;