Fix conflicts in merge.
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/7e6f3ae7 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/7e6f3ae7 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/7e6f3ae7 Branch: refs/heads/master Commit: 7e6f3ae75e993ab457bc56bca8a039b42249bed9 Parents: bca018f Author: Chris Mattmann <[email protected]> Authored: Sun Oct 15 11:52:25 2017 -0700 Committer: Chris Mattmann <[email protected]> Committed: Sun Oct 15 11:52:25 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java | 9 --------- 1 file changed, 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/7e6f3ae7/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java ---------------------------------------------------------------------- diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java index 37bb6fb..c9d338a 100644 --- a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java +++ b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java @@ -18,8 +18,6 @@ package org.apache.oodt.pcs.tools; //JDK imports -<<<<<<< HEAD -======= import java.io.IOException; import java.net.InetSocketAddress; import java.util.Calendar; @@ -35,8 +33,6 @@ import java.util.logging.Level; import org.apache.avro.ipc.NettyTransceiver; import org.apache.avro.ipc.specific.SpecificRequestor; import org.apache.oodt.cas.resource.system.extern.AvroRpcBatchStub; ->>>>>>> a9dd1914d... wip - import org.apache.oodt.cas.crawl.daemon.CrawlDaemonController; import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys; import org.apache.oodt.cas.filemgr.structs.Product; @@ -624,15 +620,10 @@ public final class PCSHealthMonitor implements CoreMetKeys, NettyTransceiver client; AvroRpcBatchStub proxy; try { -<<<<<<< HEAD - return (Boolean) client.execute("batchstub.isAlive", argList); - } catch (Exception e) { -======= client = new NettyTransceiver(new InetSocketAddress(node.getIpAddr().getPort())); proxy = (AvroRpcBatchStub) SpecificRequestor.getClient(AvroRpcBatchStub.class, client); return proxy.isAlive(); } catch (IOException e) { ->>>>>>> a9dd1914d... wip return false; } }
