Merge pull request #78 from osheroff/fix_deadlock

Fix deadlock

Author: osheroff

.circleci/config.yml

@@ -35,7 +35,7 @@ jobs:
           command: echo "testing under mysql $MYSQL_VERSION"
       - run:
           name: testit
-          command: mvn verify
+          command: mvn verify -Dgpg.skip
       - store_artifacts:
           path: test.log
 

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.zendesk</groupId>
     <artifactId>mysql-binlog-connector-java</artifactId>
-    <version>0.25.6</version>
+    <version>0.26.0</version>
 
     <name>mysql-binlog-connector-java</name>
     <description>MySQL Binary Log connector</description>

src/main/java/com/github/shyiko/mysql/binlog/BinaryLogClient.java

@@ -794,17 +794,13 @@ public void run() {
                             }
                         }
                         if (connectionLost) {
-                            if (logger.isLoggable(Level.INFO)) {
-                                logger.info("Trying to restore lost connection to " + hostname + ":" + port);
-                            }
+                            logger.info("Keepalive: Trying to restore lost connection to " + hostname + ":" + port);
                             try {
                                 terminateConnect();
                                 connect(connectTimeout);
                             } catch (Exception ce) {
-                                if (logger.isLoggable(Level.WARNING)) {
-                                    logger.warning("Failed to restore connection to " + hostname + ":" + port +
-                                        ". Next attempt in " + keepAliveInterval + "ms");
-                                }
+                                logger.warning("keepalive: Failed to restore connection to " + hostname + ":" + port +
+                                    ". Next attempt in " + keepAliveInterval + "ms");
                             }
                         }
                     }
@@ -1182,17 +1178,17 @@ private void terminateKeepAliveThread() {
         try {
             keepAliveThreadExecutorLock.lock();
             ExecutorService keepAliveThreadExecutor = this.keepAliveThreadExecutor;
-            if (keepAliveThreadExecutor == null) {
+            if ( keepAliveThreadExecutor == null ) {
                 return;
             }
             keepAliveThreadExecutor.shutdownNow();
-            while (!awaitTerminationInterruptibly(keepAliveThreadExecutor,
-                Long.MAX_VALUE, TimeUnit.NANOSECONDS)) {
-                // ignore
-            }
         } finally {
             keepAliveThreadExecutorLock.unlock();
         }
+        while (!awaitTerminationInterruptibly(keepAliveThreadExecutor,
+            Long.MAX_VALUE, TimeUnit.NANOSECONDS)) {
+            // ignore
+        }
     }
 
     private static boolean awaitTerminationInterruptibly(ExecutorService executorService, long timeout, TimeUnit unit) {