tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jihoon...@apache.org
Subject [04/10] tajo git commit: TAJO-1605: Fix master build failure on jdk 1.6. (jinho)
Date Sat, 16 May 2015 12:15:35 GMT
TAJO-1605: Fix master build failure on jdk 1.6. (jinho)

Closes #569


Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/f3acbdf5
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/f3acbdf5
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/f3acbdf5

Branch: refs/heads/index_support
Commit: f3acbdf5c69e7cf5a892ea2c07b9548c648cd64f
Parents: d3ca4bc
Author: Jinho Kim <jhkim@apache.org>
Authored: Fri May 15 11:47:59 2015 +0900
Committer: Jinho Kim <jhkim@apache.org>
Committed: Fri May 15 11:47:59 2015 +0900

----------------------------------------------------------------------
 CHANGES                                                  |  2 ++
 .../java/org/apache/tajo/service/HAServiceTracker.java   | 11 ++++++++---
 .../org/apache/tajo/worker/WorkerHeartbeatService.java   |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/f3acbdf5/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index da16ffe..77be589 100644
--- a/CHANGES
+++ b/CHANGES
@@ -123,6 +123,8 @@ Release 0.11.0 - unreleased
 
   BUG FIXES
 
+    TAJO-1605: Fix master build failure on jdk 1.6. (jinho)
+
     TAJO-1485: Datum 'Char' returned only 1byte.
     (Contributed by DaeMyung Kang, Committed by jihoon)
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/f3acbdf5/tajo-common/src/main/java/org/apache/tajo/service/HAServiceTracker.java
----------------------------------------------------------------------
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 081b153..8c553e9 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 @@ package org.apache.tajo.service;
 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;
 
@@ -59,7 +58,13 @@ public abstract class HAServiceTracker implements ServiceTracker {
     } catch (Exception e) {
       isAlive = false;
     } finally {
-      FileUtil.cleanup(LOG, socket);
+      if (socket != null) {
+        try {
+          socket.close();
+        } catch (IOException e) {
+          LOG.debug(e.getMessage(), e);
+        }
+      }
     }
     return isAlive;
   }

http://git-wip-us.apache.org/repos/asf/tajo/blob/f3acbdf5/tajo-core/src/main/java/org/apache/tajo/worker/WorkerHeartbeatService.java
----------------------------------------------------------------------
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 9afee5a..bd70d59 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 class WorkerHeartbeatService extends AbstractService {
     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();
   }


Mime
View raw message