infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-12 17:03:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8171432: (fs) WindowsWatchService.Poller::run does not call ReadDirectoryChangesW after a ERROR_NOTIFY_ENUM_DIR

Browse Source 
Reviewed-by: alanb, djelinski
This commit is contained in:
Brian Burkhalter 2025-12-03 19:58:28 +00:00
parent aff25f135a
commit 8a5db916af
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -610,23 +610,24 @@ class WindowsWatchService
boolean criticalError = false;
int errorCode = info.error();
int messageSize = info.bytesTransferred();
if (errorCode == ERROR_NOTIFY_ENUM_DIR) {
// buffer overflow
key.signalEvent(StandardWatchEventKinds.OVERFLOW, null);
} else if (errorCode != 0 && errorCode != ERROR_MORE_DATA) {
if (errorCode != 0 &&
errorCode != ERROR_MORE_DATA &&
errorCode != ERROR_NOTIFY_ENUM_DIR) {
// ReadDirectoryChangesW failed
criticalError = true;
} else {
// ERROR_MORE_DATA is a warning about incomplete
// data transfer over TCP/UDP stack. For the case
// [messageSize] is zero in the most of cases.
// [messageSize] is zero in most cases.
if (messageSize > 0) {
// process non-empty events.
processEvents(key, messageSize);
} else if (errorCode == 0) {
// insufficient buffer size
// not described, but can happen.
} else if (errorCode == 0 ||
errorCode == ERROR_NOTIFY_ENUM_DIR) {
// errorCode == 0: insufficient buffer size;
// not described, but can happen.
// errorCode == ERROR_NOTIFY_ENUM_DIR: buffer overflow
key.signalEvent(StandardWatchEventKinds.OVERFLOW, null);
}