You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/03/09 19:17:27 UTC
svn commit: r1298955 - in /lucene/dev/trunk/lucene/core/src:
java/org/apache/lucene/store/ test/org/apache/lucene/index/
test/org/apache/lucene/store/
Author: rmuir
Date: Fri Mar 9 18:17:27 2012
New Revision: 1298955
URL: http://svn.apache.org/viewvc?rev=1298955&view=rev
Log:
LUCENE-3680: more exception consistency in o.a.l.store
Modified:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/ChecksumIndexInput.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/ChecksumIndexOutput.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/CompoundFileWriter.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/NativeFSLockFactory.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/SimpleFSLockFactory.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCompoundFile.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/ChecksumIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/ChecksumIndexInput.java?rev=1298955&r1=1298954&r2=1298955&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/ChecksumIndexInput.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/ChecksumIndexInput.java Fri Mar 9 18:17:27 2012
@@ -67,7 +67,7 @@ public class ChecksumIndexInput extends
@Override
public void seek(long pos) {
- throw new RuntimeException("not allowed");
+ throw new UnsupportedOperationException();
}
@Override
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/ChecksumIndexOutput.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/ChecksumIndexOutput.java?rev=1298955&r1=1298954&r2=1298955&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/ChecksumIndexOutput.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/ChecksumIndexOutput.java Fri Mar 9 18:17:27 2012
@@ -68,7 +68,7 @@ public class ChecksumIndexOutput extends
@Override
public void seek(long pos) {
- throw new RuntimeException("not allowed");
+ throw new UnsupportedOperationException();
}
/**
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/CompoundFileWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/CompoundFileWriter.java?rev=1298955&r1=1298954&r2=1298955&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/CompoundFileWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/CompoundFileWriter.java Fri Mar 9 18:17:27 2012
@@ -153,7 +153,7 @@ final class CompoundFileWriter implement
*/
public void close() throws IOException {
if (closed) {
- throw new IllegalStateException("already closed");
+ return;
}
IOException priorException = null;
IndexOutput entryTableOut = null;
@@ -192,7 +192,7 @@ final class CompoundFileWriter implement
private final void ensureOpen() {
if (closed) {
- throw new IllegalStateException("CFS Directory is already closed");
+ throw new AlreadyClosedException("CFS Directory is already closed");
}
}
@@ -260,7 +260,7 @@ final class CompoundFileWriter implement
} else {
entry.dir = this.directory;
if (directory.fileExists(name)) {
- throw new IOException("File already exists");
+ throw new IllegalArgumentException("File " + name + " already exists");
}
out = new DirectCFSIndexOutput(directory.createOutput(name, context), entry,
true);
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/NativeFSLockFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/NativeFSLockFactory.java?rev=1298955&r1=1298954&r2=1298955&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/NativeFSLockFactory.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/NativeFSLockFactory.java Fri Mar 9 18:17:27 2012
@@ -171,6 +171,7 @@ class NativeFSLock extends Lock {
throw new IOException("Cannot create directory: " +
lockDir.getAbsolutePath());
} else if (!lockDir.isDirectory()) {
+ // TODO: NoSuchDirectoryException instead?
throw new IOException("Found regular file where directory expected: " +
lockDir.getAbsolutePath());
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/SimpleFSLockFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/SimpleFSLockFactory.java?rev=1298955&r1=1298954&r2=1298955&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/SimpleFSLockFactory.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/SimpleFSLockFactory.java Fri Mar 9 18:17:27 2012
@@ -121,6 +121,7 @@ class SimpleFSLock extends Lock {
throw new IOException("Cannot create directory: " +
lockDir.getAbsolutePath());
} else if (!lockDir.isDirectory()) {
+ // TODO: NoSuchDirectoryException instead?
throw new IOException("Found regular file where directory expected: " +
lockDir.getAbsolutePath());
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCompoundFile.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCompoundFile.java?rev=1298955&r1=1298954&r2=1298955&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCompoundFile.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCompoundFile.java Fri Mar 9 18:17:27 2012
@@ -682,7 +682,7 @@ public class TestCompoundFile extends Lu
try {
newDir.copy(csw, "d1", "d1", newIOContext(random));
fail("file does already exist");
- } catch (IOException e) {
+ } catch (IllegalArgumentException e) {
//
}
out.close();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java?rev=1298955&r1=1298954&r2=1298955&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java Fri Mar 9 18:17:27 2012
@@ -125,7 +125,7 @@ public class TestFileSwitchDirectory ext
try {
newDir.copy(csw, "d1", "d1", newIOContext(random));
fail("file does already exist");
- } catch (IOException e) {
+ } catch (IllegalArgumentException e) {
//
}
out.close();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java?rev=1298955&r1=1298954&r2=1298955&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java Fri Mar 9 18:17:27 2012
@@ -156,7 +156,7 @@ public class TestNRTCachingDirectory ext
try {
newDir.copy(csw, "d1", "d1", newIOContext(random));
fail("file does already exist");
- } catch (IOException e) {
+ } catch (IllegalArgumentException e) {
//
}
out.close();