Repository: apex-malhar Updated Branches: refs/heads/master 4c651f990 -> b439a72d1
APEXMALHAR-2236 added null check in isConnect and disconnect methods Project: http://git-wip-us.apache.org/repos/asf/apex-malhar/repo Commit: http://git-wip-us.apache.org/repos/asf/apex-malhar/commit/b439a72d Tree: http://git-wip-us.apache.org/repos/asf/apex-malhar/tree/b439a72d Diff: http://git-wip-us.apache.org/repos/asf/apex-malhar/diff/b439a72d Branch: refs/heads/master Commit: b439a72d1349d349175a4490d1f19a74e8026dbe Parents: 4c651f9 Author: shubham <[email protected]> Authored: Tue Sep 13 17:21:47 2016 -0700 Committer: shubham <[email protected]> Committed: Tue Sep 13 17:48:45 2016 -0700 ---------------------------------------------------------------------- .../java/com/datatorrent/lib/db/jdbc/JdbcStore.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/b439a72d/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcStore.java ---------------------------------------------------------------------- diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcStore.java b/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcStore.java index 5d6f5bf..1ce01fe 100644 --- a/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcStore.java +++ b/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcStore.java @@ -176,10 +176,12 @@ public class JdbcStore implements Connectable @Override public void disconnect() { - try { - connection.close(); - } catch (SQLException ex) { - throw new RuntimeException("closing database resource", ex); + if (connection != null) { + try { + connection.close(); + } catch (SQLException ex) { + throw new RuntimeException("closing database resource", ex); + } } } @@ -188,7 +190,7 @@ public class JdbcStore implements Connectable public boolean isConnected() { try { - return !connection.isClosed(); + return connection != null ? !connection.isClosed() : false; } catch (SQLException e) { throw new RuntimeException("is isConnected", e); }
