You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by do...@apache.org on 2011/10/04 21:30:05 UTC

svn commit: r1178923 - in /lucene/dev/trunk: lucene/contrib/CHANGES.txt modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyWriter.java

Author: doronc
Date: Tue Oct  4 19:30:05 2011
New Revision: 1178923

URL: http://svn.apache.org/viewvc?rev=1178923&view=rev
Log:
LUCENE-3484: Fix NPE in TaxonomyWriter: parents array creation was not thread safe.

Modified:
    lucene/dev/trunk/lucene/contrib/CHANGES.txt
    lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyWriter.java

Modified: lucene/dev/trunk/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/CHANGES.txt?rev=1178923&r1=1178922&r2=1178923&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/contrib/CHANGES.txt Tue Oct  4 19:30:05 2011
@@ -109,6 +109,8 @@ Bug Fixes
 
  * LUCENE-3446: Fix NPE in BooleanFilter when DocIdSet/DocIdSetIterator is null.
    Converted code to FixedBitSet and simplified.  (Uwe Schindler, Shuji Umino)
+   
+ * LUCENE-3484: Fix NPE in TaxonomyWriter: parents array creation was not thread safe.
 
 API Changes
  

Modified: lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyWriter.java?rev=1178923&r1=1178922&r2=1178923&view=diff
==============================================================================
--- lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyWriter.java (original)
+++ lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyWriter.java Tue Oct  4 19:30:05 2011
@@ -709,9 +709,8 @@ public class LuceneTaxonomyWriter implem
     return true;
   }
 
-  // TODO (Facet): synchronization of some sort?
   private ParentArray parentArray;
-  private ParentArray getParentArray() throws IOException {
+  private synchronized ParentArray getParentArray() throws IOException {
     if (parentArray==null) {
       if (reader == null) {
         reader = openReader();