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 2013/01/28 18:41:21 UTC

svn commit: r1439519 - in /lucene/dev/branches/lucene4547/lucene/core/src: java/org/apache/lucene/index/IndexWriterConfig.java java/org/apache/lucene/index/LiveIndexWriterConfig.java test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java

Author: rmuir
Date: Mon Jan 28 17:41:21 2013
New Revision: 1439519

URL: http://svn.apache.org/viewvc?rev=1439519&view=rev
Log:
fix test bug (and fix IWC to fail immediately if you do this)

Modified:
    lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java
    lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java
    lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java

Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java?rev=1439519&r1=1439518&r2=1439519&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java Mon Jan 28 17:41:21 2013
@@ -288,6 +288,9 @@ public final class IndexWriterConfig ext
    * Only takes effect when IndexWriter is first created.
    */
   public IndexWriterConfig setCodec(Codec codec) {
+    if (codec == null) {
+      throw new NullPointerException();
+    }
     this.codec = codec;
     return this;
   }

Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java?rev=1439519&r1=1439518&r2=1439519&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java Mon Jan 28 17:41:21 2013
@@ -116,6 +116,9 @@ public class LiveIndexWriterConfig {
     writeLockTimeout = IndexWriterConfig.WRITE_LOCK_TIMEOUT;
     indexingChain = DocumentsWriterPerThread.defaultIndexingChain;
     codec = Codec.getDefault();
+    if (codec == null) {
+      throw new NullPointerException();
+    }
     infoStream = InfoStream.getDefault();
     mergePolicy = new TieredMergePolicy();
     flushPolicy = new FlushByRamOrCountsPolicy();

Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java?rev=1439519&r1=1439518&r2=1439519&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java Mon Jan 28 17:41:21 2013
@@ -55,8 +55,8 @@ public class TestPerFieldDocValuesFormat
   
   @Override
   public void setUp() throws Exception {
-    super.setUp();
     codec = new RandomCodec(new Random(random().nextLong()), Collections.<String>emptySet());
+    super.setUp();
   }
   
   @Override