iox-eclipse-iceoryx#381 Return success if file descriptor is already …

…closed Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>
ApexAI · Feb 11, 2021 · e5d069b · e5d069b
1 parent f4ee4c9
commit e5d069b
Showing 1 changed file with 18 additions and 14 deletions.
diff --git a/iceoryx_utils/source/posix_wrapper/unix_domain_socket.cpp b/iceoryx_utils/source/posix_wrapper/unix_domain_socket.cpp
@@ -163,25 +163,29 @@ cxx::expected<bool, IpcChannelError> UnixDomainSocket::unlinkIfExists(const NoPa
 
 cxx::expected<IpcChannelError> UnixDomainSocket::closeFileDescriptor() noexcept
 {
-    auto closeCall =
-        cxx::makeSmartC(closePlatformFileHandle, cxx::ReturnMode::PRE_DEFINED_ERROR_CODE, {ERROR_CODE}, {}, m_sockfd);
-
-    if (!closeCall.hasErrors())
+    if (m_sockfd != INVALID_FD)
     {
-        if (IpcChannelSide::SERVER == m_channelSide)
+        auto closeCall = cxx::makeSmartC(
+            closePlatformFileHandle, cxx::ReturnMode::PRE_DEFINED_ERROR_CODE, {ERROR_CODE}, {}, m_sockfd);
+
+        if (!closeCall.hasErrors())
         {
-            unlink(m_sockAddr.sun_path);
-        }
+            if (IpcChannelSide::SERVER == m_channelSide)
+            {
+                unlink(m_sockAddr.sun_path);
+            }
 
-        m_sockfd = INVALID_FD;
-        m_isInitialized = false;
+            m_sockfd = INVALID_FD;
+            m_isInitialized = false;
 
-        return cxx::success<void>();
-    }
-    else
-    {
-        return createErrorFromErrnum(closeCall.getErrNum());
+            return cxx::success<void>();
+        }
+        else
+        {
+            return createErrorFromErrnum(closeCall.getErrNum());
+        }
     }
+    return cxx::success<>();
 }
 
 cxx::expected<IpcChannelError> UnixDomainSocket::destroy() noexcept