archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 19:44:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6931216: TEST_BUG: test/java/nio/file/WatchService/LotsOfEvents.java failed with NPE

Browse source 
Reviewed-by: chegar
This commit is contained in:
Alan Bateman 2010-03-03 16:09:36 +00:00
parent d996cb8440
commit 140ed0124d
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
jdk/test/java/nio/file/WatchService/LotsOfEvents.java
View file

@ -102,7 +102,7 @@ public class LotsOfEvents {
int nread = 0; int nread = 0;
boolean gotOverflow = false; boolean gotOverflow = false;
do { while (key != null) {
List<WatchEvent<?>> events = key.pollEvents(); List<WatchEvent<?>> events = key.pollEvents();
for (WatchEvent<?> event: events) { for (WatchEvent<?> event: events) {
WatchEvent.Kind<?> kind = event.kind(); WatchEvent.Kind<?> kind = event.kind();
@ -122,7 +122,7 @@ public class LotsOfEvents {
if (!key.reset()) if (!key.reset())
throw new RuntimeException("Key is no longer valid"); throw new RuntimeException("Key is no longer valid");
key = watcher.poll(2, TimeUnit.SECONDS); key = watcher.poll(2, TimeUnit.SECONDS);
} while (key != null); }
// check that all expected events were received or there was an overflow // check that all expected events were received or there was an overflow
if (nread < count && !gotOverflow) if (nread < count && !gotOverflow)
@ -168,7 +168,7 @@ public class LotsOfEvents {
// process events and ensure that we don't get repeated modify // process events and ensure that we don't get repeated modify
// events for the same file. // events for the same file.
WatchKey key = watcher.poll(15, TimeUnit.SECONDS); WatchKey key = watcher.poll(15, TimeUnit.SECONDS);
do { while (key != null) {
Set<Path> modified = new HashSet<Path>(); Set<Path> modified = new HashSet<Path>();
for (WatchEvent<?> event: key.pollEvents()) { for (WatchEvent<?> event: key.pollEvents()) {
WatchEvent.Kind<?> kind = event.kind(); WatchEvent.Kind<?> kind = event.kind();
@ -186,7 +186,7 @@ public class LotsOfEvents {
if (!key.reset()) if (!key.reset())
throw new RuntimeException("Key is no longer valid"); throw new RuntimeException("Key is no longer valid");
key = watcher.poll(2, TimeUnit.SECONDS); key = watcher.poll(2, TimeUnit.SECONDS);
} while (key != null); }
} }
} finally { } finally {