isc_sync.cpp (Firebird-3.0.2.32703-0.tar.bz2) | : | isc_sync.cpp (Firebird-3.0.4.33054-0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 2196 | skipping to change at line 2196 | |||
GENERIC_READ | GENERIC_W RITE, | GENERIC_READ | GENERIC_W RITE, | |||
FILE_SHARE_READ | FILE_S HARE_WRITE, | FILE_SHARE_READ | FILE_S HARE_WRITE, | |||
NULL, | NULL, | |||
OPEN_ALWAYS, | OPEN_ALWAYS, | |||
FILE_ATTRIBUTE_NORMAL, | FILE_ATTRIBUTE_NORMAL, | |||
NULL); | NULL); | |||
err = GetLastError(); | err = GetLastError(); | |||
if (file_handle == INVALID_HANDLE_VALUE) | if (file_handle == INVALID_HANDLE_VALUE) | |||
{ | { | |||
if ((err == ERROR_SHARING_VIOLATION)) | if ((err == ERROR_SHARING_VIOLATION) || (err == ERROR_ACCESS_DENI ED)) | |||
{ | { | |||
if (!init_flag) { | if (!init_flag) { | |||
CloseHandle(event_handle); | CloseHandle(event_handle); | |||
} | } | |||
goto retry; | ||||
if (retry_count < 200) // 2 sec | ||||
goto retry; | ||||
} | } | |||
CloseHandle(event_handle); | CloseHandle(event_handle); | |||
system_call_failed::raise("CreateFile", err); | system_call_failed::raise("CreateFile", err); | |||
} | } | |||
if (init_flag) | if (init_flag) | |||
{ | { | |||
if (err == ERROR_ALREADY_EXISTS) | if (err == ERROR_ALREADY_EXISTS) | |||
{ | { | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 4 lines changed or added |