Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jdk
changeset 10246:e73c2fb244de
8042816: (fs) Path.register doesn't throw IllegalArgumentException if multiple OVERFLOW events are specified, part 2
Reviewed-by: chegar
author | alanb |
---|---|
date | Fri, 09 May 2014 09:47:07 +0100 |
parents | 39430f339350 |
children | b979b2e97874 |
files | src/share/classes/sun/nio/fs/PollingWatchService.java |
diffstat | 1 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/sun/nio/fs/PollingWatchService.java Wed May 07 16:50:40 2014 +0400 +++ b/src/share/classes/sun/nio/fs/PollingWatchService.java Fri May 09 09:47:07 2014 +0100 @@ -74,8 +74,6 @@ throws IOException { // 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 = new HashSet<WatchEvent.Kind<?>>(events.length); for (WatchEvent.Kind<?> event: events) { @@ -90,8 +88,6 @@ // OVERFLOW is ignored if (event == StandardWatchEventKinds.OVERFLOW) { - if (events.length == 1) - throw new IllegalArgumentException("No events to register"); continue; } @@ -100,6 +96,8 @@ throw new NullPointerException("An element in event set is 'null'"); 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 SensitivityWatchEventModifier sensivity = SensitivityWatchEventModifier.MEDIUM;