This is an automated email from the ASF dual-hosted git repository. dschneider pushed a commit to branch feature/GEODE-3781 in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-3781 by this push: new b52be2d added close b52be2d is described below commit b52be2dbb5e77587f4bd70d681a9bdc2a469567f Author: Darrel Schneider <dschnei...@pivotal.io> AuthorDate: Wed Nov 1 14:11:53 2017 -0700 added close --- .../org/apache/geode/connectors/jdbc/JDBCAsyncWriter.java | 6 +++++- .../java/org/apache/geode/connectors/jdbc/JDBCLoader.java | 6 +++++- .../apache/geode/connectors/jdbc/JDBCSynchronousWriter.java | 6 +++++- .../apache/geode/connectors/jdbc/internal/JDBCManager.java | 9 +++++++++ .../geode/connectors/jdbc/internal/JDBCManagerUnitTest.java | 13 +++++++++++++ 5 files changed, 37 insertions(+), 3 deletions(-) diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JDBCAsyncWriter.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JDBCAsyncWriter.java index 0d2f8d6..771aec1 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JDBCAsyncWriter.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JDBCAsyncWriter.java @@ -41,7 +41,11 @@ public class JDBCAsyncWriter implements AsyncEventListener { private JDBCManager manager; @Override - public void close() {} + public void close() { + if (this.manager != null) { + this.manager.close(); + } + } /** * precondition: DefaultQuery.setPdxReadSerialized(true) diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JDBCLoader.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JDBCLoader.java index 162d053..c6247bd 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JDBCLoader.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JDBCLoader.java @@ -32,7 +32,11 @@ public class JDBCLoader<K, V> implements CacheLoader<K, V> { private JDBCManager manager; @Override - public void close() {} + public void close() { + if (this.manager != null) { + this.manager.close(); + } + } @SuppressWarnings("unchecked") @Override diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JDBCSynchronousWriter.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JDBCSynchronousWriter.java index a37b413..ad741f0 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JDBCSynchronousWriter.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JDBCSynchronousWriter.java @@ -42,7 +42,11 @@ public class JDBCSynchronousWriter<K, V> implements CacheWriter<K, V> { } @Override - public void close() {} + public void close() { + if (this.manager != null) { + this.manager.close(); + } + } private PdxInstance getPdxNewValue(EntryEvent<K, V> event) { // TODO: have a better API that lets you do this diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JDBCManager.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JDBCManager.java index 4429add..ce18c3f 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JDBCManager.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JDBCManager.java @@ -458,4 +458,13 @@ public class JDBCManager { } } } + + public void close() { + if (this.conn != null) { + try { + this.conn.close(); + } catch (SQLException ignore) { + } + } + } } diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JDBCManagerUnitTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JDBCManagerUnitTest.java index e37c274..065b9c7 100644 --- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JDBCManagerUnitTest.java +++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JDBCManagerUnitTest.java @@ -357,6 +357,19 @@ public class JDBCManagerUnitTest { } @Test + public void callClose() throws SQLException { + createDefaultManager(); + this.mgr.close(); + } + + @Test + public void callCloseWithConnection() throws SQLException { + createDefaultManager(); + this.mgr.getConnection(null, null); + this.mgr.close(); + } + + @Test public void verifyInsertUpdate() throws SQLException { createUpsertManager(); GemFireCacheImpl cache = Fakes.cache(); -- To stop receiving notification emails like this one, please contact ['"commits@geode.apache.org" <commits@geode.apache.org>'].