Skip to content

Commit 9eea3e0

Browse files
committed
Fix Checker Framework error
1 parent 4cad3cb commit 9eea3e0

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

src/main/java/engineering/swat/watch/impl/overflows/IndexingRescanner.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import java.nio.file.attribute.BasicFileAttributes;
3434
import java.nio.file.attribute.FileTime;
3535
import java.util.ArrayDeque;
36+
import java.util.Collections;
3637
import java.util.Deque;
3738
import java.util.HashSet;
3839
import java.util.Map;
@@ -42,6 +43,7 @@
4243

4344
import org.apache.logging.log4j.LogManager;
4445
import org.apache.logging.log4j.Logger;
46+
import org.checkerframework.checker.nullness.qual.KeyFor;
4547
import org.checkerframework.checker.nullness.qual.Nullable;
4648

4749
import engineering.swat.watch.WatchEvent;
@@ -92,9 +94,9 @@ private static class Index {
9294
return nested == null ? null : nested.get(fileName);
9395
}
9496

95-
public @Nullable Set<Path> getFileNames(Path parent) {
97+
public Set<Path> getFileNames(Path parent) {
9698
var nested = lastModifiedTimes.get(parent);
97-
return nested == null ? null : nested.keySet();
99+
return nested == null ? Collections.emptySet() : (Set<Path>) nested.keySet();
98100
}
99101

100102
public @Nullable FileTime remove(Path p) {
@@ -214,10 +216,9 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
214216
@Override
215217
public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
216218
// Issue `DELETED` events based on the set of paths visited in `dir`
217-
var indexedInDir = index.getFileNames(dir);
218219
var visitedInDir = visited.pop();
219-
if (indexedInDir != null && visitedInDir != null) {
220-
for (var p : indexedInDir) {
220+
if (visitedInDir != null) {
221+
for (var p : index.getFileNames(dir)) {
221222
if (!visitedInDir.contains(p)) {
222223
var fullPath = dir.resolve(p);
223224
// The index may have been updated during the visit, so

0 commit comments

Comments
 (0)