Changeset 31500

Timestamp:

2017-03-13T13:56:36+13:00 (7 years ago)

Author:

davidb

Message:

Synchronize on reading in of white-list and universal-lang-pos

File:

• other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/org/hathitrust/extractedfeatures/PerVolumeJSON.java (modified) (2 diffs)

other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/org/hathitrust/extractedfeatures/PerVolumeJSON.java

@@ -74 +74 @@
 
     { 
-        if ((_whitelist_filename != null) && (_whitelist_bloomfilter == null)) {
-            _whitelist_bloomfilter = new WhitelistBloomFilter(_whitelist_filename,true);
-        }
-        
-        if ((_langmap_directory != null) && (_universal_langmap == null)) {
-            _universal_langmap = new UniversalPOSLangMap(_langmap_directory);
-        }
+            if (_whitelist_filename != null) {
+
+            synchronized (_whitelist_filename) {
+            if (_whitelist_bloomfilter == null) {
+                
+                _whitelist_bloomfilter = new WhitelistBloomFilter(_whitelist_filename,true);
+            }
+            }
+        }
+        
+        if (_langmap_directory != null) {
+
+            synchronized (_langmap_directory) {
+            if (_universal_langmap == null) {
+                _universal_langmap = new UniversalPOSLangMap(_langmap_directory);
+            }
+            }
+        }
+
         int ef_num_pages = 0;
 
@@ -143 +155 @@
                                 System.out.println("==================");
                             }
-                            SolrDocJSON.postSolrDoc(solr_url, solr_add_doc_json);
+                            SolrDocJSON.postSolrDoc(solr_url, solr_add_doc_json,
+                                        volume_id, page_id);
                         }