give the operation a default timeout of infinite, just like statements

microsoft · Oct 25, 2018 · f9e6ea6 · f9e6ea6
1 parent 4f1c5bd
commit f9e6ea6
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java
@@ -2003,11 +2003,9 @@ public int[] executeBatch() throws SQLServerException, BatchUpdateException, SQL
                     }
 
                     SQLServerBulkCopy bcOperation = new SQLServerBulkCopy(connection);
-                    if (queryTimeout > 0) {
-                        SQLServerBulkCopyOptions option = new SQLServerBulkCopyOptions();
-                        option.setBulkCopyTimeout(queryTimeout);
-                        bcOperation.setBulkCopyOptions(option);
-                    }
+                    SQLServerBulkCopyOptions option = new SQLServerBulkCopyOptions();
+                    option.setBulkCopyTimeout(queryTimeout);
+                    bcOperation.setBulkCopyOptions(option);
                     bcOperation.setDestinationTableName(tableName);
                     bcOperation.setStmtColumnEncriptionSetting(this.getStmtColumnEncriptionSetting());
                     bcOperation.setDestinationTableMetadata(rs);
@@ -2162,11 +2160,9 @@ public long[] executeLargeBatch() throws SQLServerException, BatchUpdateExceptio
                     }
 
                     SQLServerBulkCopy bcOperation = new SQLServerBulkCopy(connection);
-                    if (queryTimeout > 0) {
-                        SQLServerBulkCopyOptions option = new SQLServerBulkCopyOptions();
-                        option.setBulkCopyTimeout(queryTimeout);
-                        bcOperation.setBulkCopyOptions(option);
-                    }
+                    SQLServerBulkCopyOptions option = new SQLServerBulkCopyOptions();
+                    option.setBulkCopyTimeout(queryTimeout);
+                    bcOperation.setBulkCopyOptions(option);
                     bcOperation.setDestinationTableName(tableName);
                     bcOperation.setStmtColumnEncriptionSetting(this.getStmtColumnEncriptionSetting());
                     bcOperation.setDestinationTableMetadata(rs);