- if (optional<status> result = current->test())
- return std::make_pair(*result, current);
+ if (current->m_requests[0] != MPI_REQUEST_NULL &&
+ current->m_requests[1] != MPI_REQUEST_NULL)
+ if (optional<status> result = current->test())
+ return std::make_pair(*result, current);