From 04f03713fc78056b6f90b3edcfc157cf9e4967f7 Mon Sep 17 00:00:00 2001
From: Jinho Kim <jhkim@apache.org>
Date: Fri, 15 May 2015 10:28:23 +0900
Subject: [PATCH 1/2] TAJO-1605: Fix master build failure on jdk 1.6

---
 .../org/apache/tajo/service/HAServiceTracker.java   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tajo-common/src/main/java/org/apache/tajo/service/HAServiceTracker.java b/tajo-common/src/main/java/org/apache/tajo/service/HAServiceTracker.java
index 081b1530a3..f9e4e076f9 100644
--- a/tajo-common/src/main/java/org/apache/tajo/service/HAServiceTracker.java
+++ b/tajo-common/src/main/java/org/apache/tajo/service/HAServiceTracker.java
@@ -21,10 +21,9 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.net.NetUtils;
-import org.apache.tajo.conf.TajoConf;
-import org.apache.tajo.util.FileUtil;
 
 import javax.net.SocketFactory;
+import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 
@@ -56,10 +55,16 @@ public static boolean checkConnection(InetSocketAddress address) {
 
       socket = socketFactory.createSocket();
       NetUtils.connect(socket, address, connectionTimeout);
-    } catch (Exception e) {
+    } catch (IOException e) {
       isAlive = false;
     } finally {
-      FileUtil.cleanup(LOG, socket);
+      if (socket != null) {
+        try {
+          socket.close();
+        } catch (IOException e) {
+          LOG.debug(e.getMessage(), e);
+        }
+      }
     }
     return isAlive;
   }

From e82ac4fbe852cb7376dc2fb05c370c6408a1d7a3 Mon Sep 17 00:00:00 2001
From: Jinho Kim <jhkim@apache.org>
Date: Fri, 15 May 2015 11:16:24 +0900
Subject: [PATCH 2/2] fix startup failure

---
 .../src/main/java/org/apache/tajo/service/HAServiceTracker.java | 2 +-
 .../java/org/apache/tajo/worker/WorkerHeartbeatService.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tajo-common/src/main/java/org/apache/tajo/service/HAServiceTracker.java b/tajo-common/src/main/java/org/apache/tajo/service/HAServiceTracker.java
index f9e4e076f9..8c553e910b 100644
--- a/tajo-common/src/main/java/org/apache/tajo/service/HAServiceTracker.java
+++ b/tajo-common/src/main/java/org/apache/tajo/service/HAServiceTracker.java
@@ -55,7 +55,7 @@ public static boolean checkConnection(InetSocketAddress address) {
 
       socket = socketFactory.createSocket();
       NetUtils.connect(socket, address, connectionTimeout);
-    } catch (IOException e) {
+    } catch (Exception e) {
       isAlive = false;
     } finally {
       if (socket != null) {
diff --git a/tajo-core/src/main/java/org/apache/tajo/worker/WorkerHeartbeatService.java b/tajo-core/src/main/java/org/apache/tajo/worker/WorkerHeartbeatService.java
index 9afee5a003..bd70d59092 100644
--- a/tajo-core/src/main/java/org/apache/tajo/worker/WorkerHeartbeatService.java
+++ b/tajo-core/src/main/java/org/apache/tajo/worker/WorkerHeartbeatService.java
@@ -74,12 +74,12 @@ public void serviceInit(Configuration conf) throws Exception {
     this.systemConf = (TajoConf) conf;
 
     this.connectionManager = RpcClientManager.getInstance();
+    thread = new WorkerHeartbeatThread();
     super.serviceInit(conf);
   }
 
   @Override
   public void serviceStart() throws Exception {
-    thread = new WorkerHeartbeatThread();
     thread.start();
     super.serviceStart();
   }