1 files changed, 7 insertions, 5 deletions
diff --git a/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java b/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java
index fa0b14834..df7734891 100644
--- a/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java
+++ b/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java
@@ -152,11 +152,13 @@ class WindowsDirectoryStream
             }
             Path entry = WindowsPath
                 .createFromNormalizedPath(dir.getFileSystem(), s, attrs);
-            if (filter.accept(entry)) {
-                return entry;
-            } else {
-                return null;
+            try {
+                if (filter.accept(entry))
+                    return entry;
+            } catch (IOException ioe) {
+                throwAsConcurrentModificationException(ioe);
             }
+            return null;
         }
 
         // reads next directory entry
@@ -244,7 +246,7 @@ class WindowsDirectoryStream
                 prevEntry = null;
             }
             try {
-                entry.delete(true);
+                entry.delete();
             } catch (IOException ioe) {
                 throwAsConcurrentModificationException(ioe);
             } catch (SecurityException se) {