Changes requested by Raman, in code review for PR 3806.

IQSS · May 12, 2017 · 8800ad7 · 8800ad7
1 parent 1e32ab0
commit 8800ad7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAIRecordServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAIRecordServiceBean.java
@@ -312,7 +312,7 @@ public List<OAIRecord> findOaiRecordsNotInThisSet(String setName, Date from, Dat
 
     public List<OAIRecord> findOaiRecordsBySetName(String setName, Date from, Date until, boolean excludeSet) {
 
-        String queryString ="SELECT object(h) from OAIRecord as h where h.id is not null";
+        String queryString ="SELECT object(h) from OAIRecord h where h.id is not null";
         if (setName != null) {
             if (excludeSet) {
                 queryString += " and h.setName is not null and h.setName != '' and h.setName != :setName";

diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XitemRepository.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/XitemRepository.java
@@ -224,7 +224,7 @@ private void addExtraSets(Object xoaiItemsList, String setSpec, Date from, Date
 
         List<OAIRecord> oaiRecords = recordService.findOaiRecordsNotInThisSet(setSpec, from, until);
 
-        if (oaiRecords == null && oaiRecords.isEmpty()) {
+        if (oaiRecords == null || oaiRecords.isEmpty()) {
             return;
         }