From: Sarit Zubakov <saritz@mellanox.com>
Date: Wed, 29 Mar 2017 15:28:10 +0000 (+0000)
Subject: src/msg/async: Update fix broken compilation for Posix
X-Git-Tag: v12.0.2~125^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=89dfc561f119f4775c439f5b9871d5947eaeeb4c;p=ceph-ci.git

src/msg/async: Update fix broken compilation for Posix

This commit relates to PR#13940

issue: 1010987

Change-Id: I402812adcf816c145356f0b98cfd1869c4cd5400
Signed-off-by: Sarit Zubakov <saritz@mellanox.com>
---

diff --git a/src/msg/async/PosixStack.cc b/src/msg/async/PosixStack.cc
index b24febd75a2..0422b4e26b7 100644
--- a/src/msg/async/PosixStack.cc
+++ b/src/msg/async/PosixStack.cc
@@ -278,12 +278,14 @@ int PosixServerSocketImpl::accept(ConnectedSocket *sock, const SocketOptions &op
     ::close(sd);
     return -errno;
   }
+
+  assert(NULL != out); //out should not be NULL in accept connection
+
+  out->set_sockaddr((sockaddr*)&ss);
   handler.set_priority(sd, opt.priority, out->get_family());
 
   std::unique_ptr<PosixConnectedSocketImpl> csi(new PosixConnectedSocketImpl(handler, *out, sd, true));
   *sock = ConnectedSocket(std::move(csi));
-  if (out)
-    out->set_sockaddr((sockaddr*)&ss);
   return 0;
 }