Merge pull request #1002 from Tuvie/master

fix two bugs about rdma