Update snapshot(2018-01-10)

[platform/upstream/iotivity.git] / resource / csdk / connectivity / src / tcp_adapter / catcpserver.c

diff --git a/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c b/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
index 7136fe0..627028e 100644 (file)
--- a/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
+++ b/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
@@ -288,6 +288,7 @@ static void CASelectReturned(fd_set *readFds)
     }
     else
     {
+        oc_mutex_lock(g_mutexObjectList);
         uint32_t length = u_arraylist_length(caglobals.tcp.svrlist);
         for (size_t i = 0; i < length; i++)
         {
@@ -301,6 +302,7 @@ static void CASelectReturned(fd_set *readFds)
                 }
             }
         }
+        oc_mutex_unlock(g_mutexObjectList);
     }
 }
 
@@ -1370,7 +1372,6 @@ CASocketFd_t CAGetSocketFDFromEndpoint(const CAEndpoint_t *endpoint)
 
 CATCPSessionInfo_t *CAGetSessionInfoFromFD(int fd, size_t *index)
 {
-    oc_mutex_lock(g_mutexObjectList);
 
     // check from the last item.
     CATCPSessionInfo_t *svritem = NULL;
@@ -1387,7 +1388,6 @@ CATCPSessionInfo_t *CAGetSessionInfoFromFD(int fd, size_t *index)
         }
     }
 
-    oc_mutex_unlock(g_mutexObjectList);
 
     return NULL;
 }