[misc] initialize read-ahead scheduler only if needed

mariadb-corporation · Sep 5, 2017 · abba398 · abba398
1 parent 348d294
commit abba398
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractMultiSend.java b/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractMultiSend.java
@@ -61,6 +61,7 @@
 import org.mariadb.jdbc.internal.util.dao.ClientPrepareResult;
 import org.mariadb.jdbc.internal.util.dao.PrepareResult;
 import org.mariadb.jdbc.internal.util.dao.ServerPrepareResult;
+import org.mariadb.jdbc.internal.util.scheduler.SchedulerServiceProviderHolder;
 
 import java.io.IOException;
 import java.sql.SQLException;
@@ -234,6 +235,13 @@ private PrepareResult executeBatchStandard(int paramCount) throws SQLException {
                         futureReadTask = new FutureTask<AsyncMultiReadResult>(new AsyncMultiRead(comStmtPrepare, status,
                                 protocol, false, this, paramCount,
                                 results, parametersList, queries, prepareResult));
+                        if (AbstractQueryProtocol.readScheduler == null) {
+                            synchronized (AbstractQueryProtocol.class) {
+                                if (AbstractQueryProtocol.readScheduler == null) {
+                                    AbstractQueryProtocol.readScheduler = SchedulerServiceProviderHolder.getBulkScheduler();
+                                }
+                            }
+                        }
                         AbstractQueryProtocol.readScheduler.execute(futureReadTask);
                     }
                 }

diff --git a/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractQueryProtocol.java b/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractQueryProtocol.java
@@ -121,13 +121,6 @@ public class AbstractQueryProtocol extends AbstractConnectProtocol implements Pr
 
     public AbstractQueryProtocol(final UrlParser urlParser, final ReentrantLock lock) {
         super(urlParser, lock);
-        if (options.useBatchMultiSend && readScheduler == null) {
-            synchronized (AbstractQueryProtocol.class) {
-                if (readScheduler == null) {
-                    readScheduler = SchedulerServiceProviderHolder.getBulkScheduler();
-                }
-            }
-        }
         logQuery = new LogQueryTool(options);
     }