Changeset 6720

Timestamp:

10/30/15 18:30:56 (9 years ago)

Author:

davor.ostojic@oeaw.ac.at

Message:

 

File:

• vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXML.java (modified) (1 diff)

vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXML.java

@@ -351 +351 @@
         
         //keep only values from original concepts, not from cross mappings
-                if(comesFromConceptMapping && !allowMultipleValues && cmdiData.getSolrDocument().containsKey(name)){
+                if(comesFromConceptMapping && !allowMultipleValues && cmdiData.getSolrDocument() != null && cmdiData.getSolrDocument().containsKey(name)){
                         cmdiData.getSolrDocument().remove(name);
                 }
                 
-                if(!comesFromConceptMapping && !allowMultipleValues && cmdiData.getSolrDocument().containsKey(name))
+                if(!comesFromConceptMapping && !allowMultipleValues && cmdiData.getSolrDocument() != null && cmdiData.getSolrDocument().containsKey(name))
                         return;