jdk/src/solaris/classes/sun/nio/fs/UnixDirectoryStream.java
changeset 3065 452aaa2899fc
parent 2057 3acf8e5e2ca0
child 4058 21c6bd5381ca
equal deleted inserted replaced
3063:a3fd491f7754 3065:452aaa2899fc
   192                 // ignore "." and ".."
   192                 // ignore "." and ".."
   193                 if (!isSelfOrParent(nameAsBytes)) {
   193                 if (!isSelfOrParent(nameAsBytes)) {
   194                     Path entry = dir.resolve(nameAsBytes);
   194                     Path entry = dir.resolve(nameAsBytes);
   195 
   195 
   196                     // return entry if no filter or filter accepts it
   196                     // return entry if no filter or filter accepts it
   197                     if (filter.accept(entry)) {
   197                     try {
   198                         return entry;
   198                         if (filter == null || filter.accept(entry))
       
   199                             return entry;
       
   200                     } catch (IOException ioe) {
       
   201                         throwAsConcurrentModificationException(ioe);
   199                     }
   202                     }
   200                 }
   203                 }
   201             }
   204             }
   202         }
   205         }
   203 
   206 
   246             try {
   249             try {
   247                 if (stream instanceof UnixSecureDirectoryStream) {
   250                 if (stream instanceof UnixSecureDirectoryStream) {
   248                     ((UnixSecureDirectoryStream)stream)
   251                     ((UnixSecureDirectoryStream)stream)
   249                         .implDelete(entry.getName(), false, 0);
   252                         .implDelete(entry.getName(), false, 0);
   250                 } else {
   253                 } else {
   251                     entry.delete(true);
   254                     entry.delete();
   252                 }
   255                 }
   253             } catch (IOException ioe) {
   256             } catch (IOException ioe) {
   254                 throwAsConcurrentModificationException(ioe);
   257                 throwAsConcurrentModificationException(ioe);
   255             } catch (SecurityException se) {
   258             } catch (SecurityException se) {
   256                 throwAsConcurrentModificationException(se);
   259                 throwAsConcurrentModificationException(se);