hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DS-3202] SolrDocument.getFieldValues() can return null, so defend!

Browse Source
This commit is contained in:
Mark H. Wood
2016-05-13 15:49:39 -04:00
parent 4de01c4448
commit 731dd48cbc
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
dspace-oai/src/main/java/org/dspace/xoai/data/DSpaceSolrItem.java
View File

@@ -17,6 +17,7 @@ import org.apache.solr.common.SolrDocument;
import com.lyncode.xoai.dataprovider.core.ItemMetadata;
import com.lyncode.xoai.dataprovider.core.ReferenceSet;
import java.util.Collection;
/**
*
@@ -24,26 +25,35 @@ import com.lyncode.xoai.dataprovider.core.ReferenceSet;
*/
public class DSpaceSolrItem extends DSpaceItem
{
private static Logger log = LogManager
private static final Logger log = LogManager
.getLogger(DSpaceSolrItem.class);
private String unparsedMD;
private final String unparsedMD;
private ItemMetadata metadata;
private String handle;
private Date lastMod;
private List<ReferenceSet> sets;
private boolean deleted;
private final String handle;
private final Date lastMod;
private final List<ReferenceSet> sets;
private final boolean deleted;
public DSpaceSolrItem (SolrDocument doc) {
log.debug("Creating OAI Item from Solr source");
unparsedMD = (String) doc.getFieldValue("item.compile");
handle = (String) doc.getFieldValue("item.handle");
lastMod = (Date) doc.getFieldValue("item.lastmodified");
sets = new ArrayList<ReferenceSet>();
for (Object obj : doc.getFieldValues("item.communities"))
sets.add(new ReferenceSet((String) obj));
for (Object obj : doc.getFieldValues("item.collections"))
sets.add(new ReferenceSet((String) obj));
sets = new ArrayList<>();
Collection<Object> fieldValues;
fieldValues = doc.getFieldValues("item.communities");
if (null != fieldValues)
for (Object obj : fieldValues)
sets.add(new ReferenceSet((String) obj));
fieldValues = doc.getFieldValues("item.collections");
if (null != fieldValues)
for (Object obj : fieldValues)
sets.add(new ReferenceSet((String) obj));
deleted = (Boolean) doc.getFieldValue("item.deleted");
}