Merge pull request #1364 from hjelmn/v2.x_ugni

jsquyres · web-flow · commit 60a418d5c0df · 2016-09-12T13:18:51.000-05: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
@@ -206,8 +206,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
`@@ -206,8 +206,11 @@ int mca_btl_ugni_ep_connect_progress (mca_btl_base_endpoint_t *ep) {`
`206`	`206`	`ep->dg_posted = true;`
`207`	`207`	`rc = OPAL_ERR_RESOURCE_BUSY;`
`208`	`208`	`}`
	`209`	`+`
`209`	`210`	`return rc;`
`210`	`211`	`}`
	`212`	`+`
	`213`	`+ return OPAL_SUCCESS;`
`211`	`214`	`}`
`212`	`215`
`213`	`216`	`return mca_btl_ugni_ep_connect_finish (ep);`