diff --git a/source/shared_lib/sources/platform/posix/socket.cpp b/source/shared_lib/sources/platform/posix/socket.cpp index f0790d7a2..fe44d4340 100644 --- a/source/shared_lib/sources/platform/posix/socket.cpp +++ b/source/shared_lib/sources/platform/posix/socket.cpp @@ -1435,6 +1435,10 @@ int Socket::receive(void *data, int dataSize, bool tryReceiveUntilDataSizeMet) { char *dataAsCharPointer = reinterpret_cast(data); int additionalBytes = receive(&dataAsCharPointer[bytesReceived], newBufferSize, tryReceiveUntilDataSizeMet); + + if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] WARNING, additionalBytes = %d\n",__FILE__,__FUNCTION__,__LINE__,additionalBytes); + if(SystemFlags::VERBOSE_MODE_ENABLED) printf("\nIn [%s::%s Line: %d] WARNING, additionalBytes = %d\n",__FILE__,__FUNCTION__,__LINE__,additionalBytes); + if(additionalBytes > 0) { bytesReceived += additionalBytes; } diff --git a/source/shared_lib/sources/util/checksum.cpp b/source/shared_lib/sources/util/checksum.cpp index d37844930..d4b6cd71f 100644 --- a/source/shared_lib/sources/util/checksum.cpp +++ b/source/shared_lib/sources/util/checksum.cpp @@ -263,10 +263,12 @@ int32 Checksum::getSum() { if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] fileList.size() = %d\n",__FILE__,__FUNCTION__,__LINE__,fileList.size()); Checksum newResult; + + { + MutexSafeWrapper safeMutexSocketDestructorFlag(&Checksum::fileListCacheSynchAccessor,string(__FILE__) + "_" + intToStr(__LINE__)); for(std::map::iterator iterMap = fileList.begin(); iterMap != fileList.end(); ++iterMap) { - MutexSafeWrapper safeMutexSocketDestructorFlag(&Checksum::fileListCacheSynchAccessor,string(__FILE__) + "_" + intToStr(__LINE__)); if(Checksum::fileListCache.find(iterMap->first) == Checksum::fileListCache.end()) { Checksum fileResult; bool fileAddedOk = fileResult.addFileToSum(iterMap->first); @@ -278,6 +280,7 @@ int32 Checksum::getSum() { } newResult.addSum(Checksum::fileListCache[iterMap->first]); } + } return newResult.getSum(); } return sum;