From d86cf85bd6b508b85facb371dd83ffb44d0ecc9e Mon Sep 17 00:00:00 2001
From: Shane Snyder <ssnyder@mcs.anl.gov>
Date: Mon, 29 Jan 2018 23:04:04 -0600
Subject: [PATCH] temporary handle reset workaround

mercury does not reset the target_id as part of HG_Reset
---
 src/margo.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/margo.c b/src/margo.c
index a2e2444..f1565c6 100644
--- a/src/margo.c
+++ b/src/margo.c
@@ -1453,6 +1453,9 @@ static hg_return_t margo_handle_cache_get(margo_instance_id mid,
     hret = HG_Reset(el->handle, addr, id);
     if(hret == HG_SUCCESS)
     {
+        /* XXX: Mercury doesn't reset the target_id so we need to do that manually for now */
+        HG_Set_target_id(el->handle, 0);
+
         /* put on in-use list and pass back handle */
         HASH_ADD(hh, mid->used_handle_hash, handle, sizeof(hg_handle_t), el);
         *handle = el->handle;
-- 
2.22.0