merge conflicts

Author: Neenu1995

java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryDatabaseMetaData.java

@@ -5278,7 +5278,7 @@ static Future<?>[] wrapThread(final Thread thread) {
         private volatile boolean cancelled = false;
 
         @Override
-        public boolean cancel(boolean mayInterruptIfRunning) {
+        public synchronized boolean cancel(boolean mayInterruptIfRunning) {
           if (cancelled || thread.getState() == Thread.State.TERMINATED) {
             return false;
           }
@@ -5336,7 +5336,13 @@ public Object get(long timeout, TimeUnit unit)
             if (remainingMillis <= 0) {
               remainingMillis = 1;
             }
-            thread.join(Math.min(remainingMillis, 50));
+
+            long delay = Math.min(remainingMillis, 50);
+            if (thread.getState() == Thread.State.NEW) {
+              Thread.sleep(delay);
+            } else {
+              thread.join(delay);
+            }
             remainingNanos = deadline - System.nanoTime();
           }
           return null;