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 2014/06/20 13:20:27 UTC
svn commit: r1604139 - in /jackrabbit/oak/branches/1.0: ./ oak-doc/
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/
Author: chetanm
Date: Fri Jun 20 11:20:26 2014
New Revision: 1604139
URL: http://svn.apache.org/r1604139
Log:
OAK-1462 - Aggregate Index isn't usable in an osgi environment
Merging only the changes done in 1601853 to 1.0.
Added:
jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
- copied unchanged from r1601853, jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-doc/ (props changed)
jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1601853
Propchange: jackrabbit/oak/branches/1.0/oak-doc/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk/oak-doc:r1590697,1601853
Modified: jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java?rev=1604139&r1=1604138&r2=1604139&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java (original)
+++ jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java Fri Jun 20 11:20:26 2014
@@ -40,12 +40,9 @@ public class LuceneIndexProvider impleme
protected final IndexTracker tracker = new IndexTracker();
- /**
- * TODO how to inject this in an OSGi friendly way?
- */
- protected Analyzer analyzer = LuceneIndexConstants.ANALYZER;
+ protected volatile Analyzer analyzer = LuceneIndexConstants.ANALYZER;
- protected NodeAggregator aggregator = null;
+ protected volatile NodeAggregator aggregator = null;
public void close() {
tracker.close();
@@ -94,5 +91,4 @@ public class LuceneIndexProvider impleme
this.setAggregator(analyzer);
return this;
}
-
}