You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2017/01/11 05:20:13 UTC
svn commit: r1778237 -
/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDoc.java
Author: chetanm
Date: Wed Jan 11 05:20:13 2017
New Revision: 1778237
URL: http://svn.apache.org/viewvc?rev=1778237&view=rev
Log:
OAK-4808 - Index external changes as part of NRT indexing
Add pre conditions for null check of passed argument
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDoc.java
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDoc.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDoc.java?rev=1778237&r1=1778236&r2=1778237&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDoc.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDoc.java Wed Jan 11 05:20:13 2017
@@ -23,6 +23,8 @@ import javax.annotation.Nullable;
import org.apache.lucene.index.IndexableField;
+import static com.google.common.base.Preconditions.checkNotNull;
+
class LuceneDoc implements LuceneDocInfo {
final String indexPath;
final String docPath;
@@ -31,7 +33,7 @@ class LuceneDoc implements LuceneDocInfo
private volatile boolean processed;
public static LuceneDoc forUpdate(String indexPath, String path, Iterable<? extends IndexableField> doc){
- return new LuceneDoc(indexPath, path, doc, false);
+ return new LuceneDoc(indexPath, path, checkNotNull(doc), false);
}
public static LuceneDoc forDelete(String indexPath, String path){
@@ -39,8 +41,8 @@ class LuceneDoc implements LuceneDocInfo
}
private LuceneDoc(String indexPath, String path, @Nullable Iterable<? extends IndexableField> doc, boolean delete) {
- this.docPath = path;
- this.indexPath = indexPath;
+ this.docPath = checkNotNull(path);
+ this.indexPath = checkNotNull(indexPath);
this.doc = doc;
this.delete = delete;
}