Merge pull request apache#8565 from iemejia/beam-master

[BEAM-7239] Do not close DataSource on Teardown on JdbcIO
grtheod · May 14, 2019 · 5c7ee60 · 5c7ee60
2 parents b0b2ac2 + c03bbec
commit 5c7ee60
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/JdbcIO.java b/sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/JdbcIO.java
@@ -769,9 +769,6 @@ public void processElement(ProcessContext context) throws Exception {
     @Teardown
     public void teardown() throws Exception {
       connection.close();
-      if (dataSource instanceof AutoCloseable) {
-        ((AutoCloseable) dataSource).close();
-      }
     }
   }
 
@@ -1075,13 +1072,6 @@ private void executeBatch() throws SQLException, IOException, InterruptedExcepti
         }
         records.clear();
       }
-
-      @Teardown
-      public void teardown() throws Exception {
-        if (dataSource instanceof AutoCloseable) {
-          ((AutoCloseable) dataSource).close();
-        }
-      }
     }
   }