Merge pull request #2046 from hjelmn/ugni_fix

hjelmn · web-flow · commit 3274203f8a55 · 2016-09-02T10:32:28.000-06:00
btl/ugni: fix erroneous warning message
diff --git a/opal/mca/btl/ugni/btl_ugni_endpoint.c b/opal/mca/btl/ugni/btl_ugni_endpoint.c
@@ -208,8 +208,11 @@ int mca_btl_ugni_ep_connect_progress (mca_btl_base_endpoint_t *ep) {
                 ep->dg_posted = true;
                 rc = OPAL_ERR_RESOURCE_BUSY;
             }
+
             return rc;
         }
+
+        return OPAL_SUCCESS;
     }
 
     return mca_btl_ugni_ep_connect_finish (ep);

Original file line number	Diff line number	Diff line change
`@@ -208,8 +208,11 @@ int mca_btl_ugni_ep_connect_progress (mca_btl_base_endpoint_t *ep) {`
`208`	`208`	`ep->dg_posted = true;`
`209`	`209`	`rc = OPAL_ERR_RESOURCE_BUSY;`
`210`	`210`	`}`
	`211`	`+`
`211`	`212`	`return rc;`
`212`	`213`	`}`
	`214`	`+`
	`215`	`+ return OPAL_SUCCESS;`
`213`	`216`	`}`
`214`	`217`
`215`	`218`	`return mca_btl_ugni_ep_connect_finish (ep);`