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

8042816: (fs) Path.register doesn't throw IllegalArgumentException if multiple OVERFLOW events are specified, part 2

Browse Source 
Reviewed-by: chegar
This commit is contained in:
Alan Bateman 2014-05-09 09:47:07 +01:00
parent 599fcee2f2
commit 3162db1047
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/src/share/classes/sun/nio/fs/PollingWatchService.java
View File

@ -74,8 +74,6 @@ class PollingWatchService
throws IOException throws IOException
{ {
// check events - CCE will be thrown if there are invalid elements // check events - CCE will be thrown if there are invalid elements
if (events.length == 0)
throw new IllegalArgumentException("No events to register");
final Set<WatchEvent.Kind<?>> eventSet = final Set<WatchEvent.Kind<?>> eventSet =
new HashSet<WatchEvent.Kind<?>>(events.length); new HashSet<WatchEvent.Kind<?>>(events.length);
for (WatchEvent.Kind<?> event: events) { for (WatchEvent.Kind<?> event: events) {
@ -90,8 +88,6 @@ class PollingWatchService
// OVERFLOW is ignored // OVERFLOW is ignored
if (event == StandardWatchEventKinds.OVERFLOW) { if (event == StandardWatchEventKinds.OVERFLOW) {
if (events.length == 1)
throw new IllegalArgumentException("No events to register");
continue; continue;
} }
@ -100,6 +96,8 @@ class PollingWatchService
throw new NullPointerException("An element in event set is 'null'"); throw new NullPointerException("An element in event set is 'null'");
throw new UnsupportedOperationException(event.name()); throw new UnsupportedOperationException(event.name());
} }
if (eventSet.isEmpty())
throw new IllegalArgumentException("No events to register");
// A modifier may be used to specify the sensitivity level // A modifier may be used to specify the sensitivity level
SensitivityWatchEventModifier sensivity = SensitivityWatchEventModifier.MEDIUM; SensitivityWatchEventModifier sensivity = SensitivityWatchEventModifier.MEDIUM;