Thanks Uwe, I'll open a 4.8 blocker for this... Mike McCandless
http://blog.mikemccandless.com On Fri, Mar 21, 2014 at 7:04 PM, Uwe Schindler <u...@thetaphi.de> wrote: > Hi Mike, > > I did a grep for NoSuchFileException on trunk and 4.x. > > In trunk we have many more of this Excepotion, especially also randomization > in MockDirectory to throw this one or FNFE. We should backport those fixes: > > Branch_4x: > ./lucene/core/src/java/org/apache/lucene/store/Directory.java: * (not > {@code java.nio.file.NoSuchFileException} of Java 7). > ./lucene/core/src/java/org/apache/lucene/store/Directory.java: * (not > {@code java.nio.file.NoSuchFileException} of Java 7). > ./lucene/core/src/java/org/apache/lucene/store/Directory.java: * (not > {@code java.nio.file.NoSuchFileException} of Java 7). > ./lucene/replicator/src/test/org/apache/lucene/replicator/LocalReplicatorTest.java:import > java.nio.file.NoSuchFileException; > ./lucene/replicator/src/test/org/apache/lucene/replicator/LocalReplicatorTest.java: > } catch (FileNotFoundException | NoSuchFileException e) { > > Trunk: > ./lucene/core/src/java/org/apache/lucene/index/DirectoryReader.java:import > java.nio.file.NoSuchFileException; > ./lucene/core/src/java/org/apache/lucene/index/DirectoryReader.java: } > catch (FileNotFoundException | NoSuchFileException fnfe) { > ./lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java:import > java.nio.file.NoSuchFileException; > ./lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java: > } catch (FileNotFoundException | NoSuchFileException e) { > ./lucene/core/src/java/org/apache/lucene/store/Directory.java:import > java.nio.file.NoSuchFileException; > ./lucene/core/src/java/org/apache/lucene/store/Directory.java: * <li>Throws > {@link FileNotFoundException} or {@link NoSuchFileException} > ./lucene/core/src/java/org/apache/lucene/store/Directory.java: * <p>Throws > {@link FileNotFoundException} or {@link NoSuchFileException} > ./lucene/core/src/java/org/apache/lucene/store/Directory.java: * <p>Throws > {@link FileNotFoundException} or {@link NoSuchFileException} > ./lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java:import > java.nio.file.NoSuchFileException; > ./lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java: } > else if (t instanceof FileNotFoundException || t instanceof > NoSuchFileException) { > ./lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java:import > java.nio.file.NoSuchFileException; > ./lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java: > fail("opening DirectoryReader on empty directory failed to produce > FileNotFoundException/NoSuchFileException"); > ./lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java: } > catch (FileNotFoundException | NoSuchFileException e) { > ./lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java: > fail("expected FileNotFoundException/NoSuchFileException"); > ./lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java: } > catch (FileNotFoundException | NoSuchFileException e) { > ./lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java: > fail("expected FileNotFoundException/NoSuchFileException"); > ./lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java: } > catch (FileNotFoundException | NoSuchFileException e) { > ./lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java:import > java.nio.file.NoSuchFileException; > ./lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java: > } catch (FileNotFoundException | NoSuchFileException ex) { > ./lucene/core/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java:import > java.nio.file.NoSuchFileException; > ./lucene/core/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java: > } catch (FileNotFoundException | NoSuchFileException e) { > ./lucene/core/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java: > } catch (FileNotFoundException | NoSuchFileException e1) { > ./lucene/core/src/test/org/apache/lucene/store/TestDirectory.java:import > java.nio.file.NoSuchFileException; > ./lucene/core/src/test/org/apache/lucene/store/TestDirectory.java: > } catch (FileNotFoundException | NoSuchFileException e) { > ./lucene/replicator/src/test/org/apache/lucene/replicator/LocalReplicatorTest.java:import > java.nio.file.NoSuchFileException; > ./lucene/replicator/src/test/org/apache/lucene/replicator/LocalReplicatorTest.java: > } catch (FileNotFoundException | NoSuchFileException e) { > ./lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java:import > java.nio.file.NoSuchFileException; > ./lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java: > throw randomState.nextBoolean() ? new FileNotFoundException("a random > IOException (" + name + ")") : new NoSuchFileException("a random IOException > (" + name + ")"); > ./lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java: > throw randomState.nextBoolean() ? new FileNotFoundException(name + " in > dir=" + in) : new NoSuchFileException(name + " in dir=" + in); > ./lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java: > throw randomState.nextBoolean() ? new FileNotFoundException(name) : new > NoSuchFileException(name); > > This is important to fix before we release 4.8 for Java 7 > > Uwe > > ----- > Uwe Schindler > H.-H.-Meier-Allee 63, D-28213 Bremen > http://www.thetaphi.de > eMail: u...@thetaphi.de > > >> -----Original Message----- >> From: mikemcc...@apache.org [mailto:mikemcc...@apache.org] >> Sent: Thursday, March 20, 2014 4:45 PM >> To: comm...@lucene.apache.org >> Subject: svn commit: r1579669 - >> /lucene/dev/branches/branch_4x/lucene/replicator/src/test/org/apache/lu >> cene/replicator/LocalReplicatorTest.java >> >> Author: mikemccand >> Date: Thu Mar 20 15:45:23 2014 >> New Revision: 1579669 >> >> URL: http://svn.apache.org/r1579669 >> Log: >> fix test fail from java 1.7 upgrade >> >> Modified: >> >> lucene/dev/branches/branch_4x/lucene/replicator/src/test/org/apache/luc >> ene/replicator/LocalReplicatorTest.java >> >> Modified: >> lucene/dev/branches/branch_4x/lucene/replicator/src/test/org/apache/luc >> ene/replicator/LocalReplicatorTest.java >> URL: >> http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/repl >> icator/src/test/org/apache/lucene/replicator/LocalReplicatorTest.java?rev=1 >> 579669&r1=1579668&r2=1579669&view=diff >> ========================================================== >> ==================== >> --- >> lucene/dev/branches/branch_4x/lucene/replicator/src/test/org/apache/luc >> ene/replicator/LocalReplicatorTest.java (original) >> +++ >> lucene/dev/branches/branch_4x/lucene/replicator/src/test/org/apache/luc >> ene/replicator/LocalReplicatorTest.java Thu Mar 20 15:45:23 2014 >> @@ -19,6 +19,7 @@ package org.apache.lucene.replicator; >> >> import java.io.FileNotFoundException; >> import java.io.IOException; >> +import java.nio.file.NoSuchFileException; >> import java.util.HashMap; >> import java.util.List; >> import java.util.Map.Entry; >> @@ -154,7 +155,7 @@ public class LocalReplicatorTest extends >> try { >> replicator.obtainFile(res.id, >> res.sourceFiles.keySet().iterator().next(), >> "madeUpFile"); >> fail("should have failed obtaining an unrecognized file"); >> - } catch (FileNotFoundException e) { >> + } catch (FileNotFoundException | NoSuchFileException e) { >> // expected >> } >> } > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org > For additional commands, e-mail: dev-h...@lucene.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For additional commands, e-mail: dev-h...@lucene.apache.org
