]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
src/msg/async: Update fix broken compilation for Posix
authorSarit Zubakov <saritz@mellanox.com>
Wed, 29 Mar 2017 15:28:10 +0000 (15:28 +0000)
committerAdir Lev <adirl@mellanox.com>
Wed, 5 Apr 2017 06:48:27 +0000 (06:48 +0000)
This commit relates to PR#13940

issue: 1010987

Change-Id: I402812adcf816c145356f0b98cfd1869c4cd5400
Signed-off-by: Sarit Zubakov <saritz@mellanox.com>
src/msg/async/PosixStack.cc

index b24febd75a29deedbf18b9746e573c1a8991276b..0422b4e26b7170bff4b22922c0b8343027837da1 100644 (file)
@@ -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;
 }