You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2017/12/18 17:13:51 UTC
[2/4] incubator-trafodion git commit: add try catch
add try catch
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d7950296
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d7950296
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d7950296
Branch: refs/heads/master
Commit: d7950296945ec26f10aadb976556f4cedfaf6fda
Parents: 47ec587
Author: gpj1987 <gp...@gmail.com>
Authored: Mon Dec 11 16:24:13 2017 +0800
Committer: gpj1987 <gp...@gmail.com>
Committed: Mon Dec 11 16:24:13 2017 +0800
----------------------------------------------------------------------
.../java/org/trafodion/jdbc_test/PropTest.java | 6 ++++-
.../trafodion/jdbc_test/TestNetworkTimeout.java | 23 +++++++++++++------
.../java/org/trafodion/jdbc_test/TestWrap.java | 24 +++++++++++++++-----
3 files changed, 39 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d7950296/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/PropTest.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/PropTest.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/PropTest.java
index 1838e7b..e802949 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/PropTest.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/PropTest.java
@@ -65,7 +65,11 @@ public class PropTest
}
catch (Exception e) {
if (conn != null) {
- conn.close();
+ try {
+ conn.close();
+ } catch (SQLException e1) {
+ e1.printStackTrace();
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d7950296/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestNetworkTimeout.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestNetworkTimeout.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestNetworkTimeout.java
index 5944672..7e01a72 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestNetworkTimeout.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestNetworkTimeout.java
@@ -57,9 +57,13 @@ public class TestNetworkTimeout {
assertTrue("this is networkTimeout", result == 100);
conn.close();
} catch (SQLException e) {
- if (conn != null) {
- conn.close();
- }
+ if (conn != null) {
+ try {
+ conn.close();
+ } catch (SQLException e1) {
+ e1.printStackTrace();
+ }
+ }
e.printStackTrace();
}
}
@@ -68,14 +72,19 @@ public class TestNetworkTimeout {
Connection conn = null;
try {
System.out.println("Connecting to database...");
- conn = Utils.getUserConnection();
+ conn = Utils.getUserConnection();S
int result = conn.getNetworkTimeout();
assertTrue("this is networkTimeout", result == 0);
conn.close();
} catch (SQLException e) {
- if (conn != null) {
- conn.close();
- }
+ if (conn != null) {
+ try {
+ conn.close();
+ } catch (SQLException e1) {
+ e1.printStackTrace();
+ }
+ }
+
e.printStackTrace();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d7950296/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestWrap.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestWrap.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestWrap.java
index 1a798f5..fe10e1b 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestWrap.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestWrap.java
@@ -53,8 +53,12 @@ public class TestWrap {
assertTrue("It is wrapper for this interface", result);
conn.close();
} catch (SQLException e) {
- if (conn !=null) {
- conn.close();
+ if (conn != null) {
+ try {
+ conn.close();
+ } catch (SQLException e1) {
+ e1.printStackTrace();
+ }
}
e.printStackTrace();
}
@@ -68,8 +72,12 @@ public class TestWrap {
conn = Utils.getUserConnection();
conn.close();
} catch (SQLException e) {
- if (conn !=null) {
- conn.close();
+ if (conn != null) {
+ try {
+ conn.close();
+ } catch (SQLException e1) {
+ e1.printStackTrace();
+ }
}
e.printStackTrace();
}
@@ -88,8 +96,12 @@ public class TestWrap {
assertTrue("It is unwrape for this interface", !result);
conn.close();
} catch (SQLException e) {
- if (conn !=null) {
- conn.close();
+ if (conn != null) {
+ try {
+ conn.close();
+ } catch (SQLException e1) {
+ e1.printStackTrace();
+ }
}
e.printStackTrace();
}