stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8133105: Fix getFinalAttributes() on Windows to handle more special cases

Browse Source 
Reviewed-by: simonis, rriggs
This commit is contained in:
Matthias Baesken 2015-08-11 10:53:50 +02:00 committed by Volker Simonis
parent 29ad7ba848
commit 1104878b02
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jdk/src/java.base/windows/native/libjava/WinNTFileSystem_md.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -233,10 +233,13 @@ DWORD getFinalAttributes(WCHAR *path)
if (GetFileAttributesExW(path, GetFileExInfoStandard, &wfad)) { if (GetFileAttributesExW(path, GetFileExInfoStandard, &wfad)) {
attr = getFinalAttributesIfReparsePoint(path, wfad.dwFileAttributes); attr = getFinalAttributesIfReparsePoint(path, wfad.dwFileAttributes);
} else if (GetLastError() == ERROR_SHARING_VIOLATION && } else {
(h = FindFirstFileW(path, &wfd)) != INVALID_HANDLE_VALUE) { DWORD lerr = GetLastError();
attr = getFinalAttributesIfReparsePoint(path, wfd.dwFileAttributes); if ((lerr == ERROR_SHARING_VIOLATION || lerr == ERROR_ACCESS_DENIED) &&
FindClose(h); (h = FindFirstFileW(path, &wfd)) != INVALID_HANDLE_VALUE) {
attr = getFinalAttributesIfReparsePoint(path, wfd.dwFileAttributes);
FindClose(h);
}
} }
return attr; return attr;
} }