Merge pull request DSpace#12113 from toniprieto/exception-oai-uncache-entities

Avoid exception during OAI update caused by uncached entities

Author: tdonohue

dspace-oai/src/main/java/org/dspace/xoai/app/XOAI.java

@@ -193,9 +193,9 @@ private int index(Instant last) throws DSpaceSolrIndexerException, IOException {
                     .findInArchiveOrWithdrawnDiscoverableModifiedSince(context, last);
             Iterator<Item> nonDiscoverableChangedItems = itemService
                     .findInArchiveOrWithdrawnNonDiscoverableModifiedSince(context, last);
+            int total = this.index(discoverableChangedItems, true) + this.index(nonDiscoverableChangedItems, true);
             Iterator<Item> possiblyChangedItems = getItemsWithPossibleChangesBefore(last);
-            return this.index(discoverableChangedItems) + this.index(nonDiscoverableChangedItems)
-                    + this.index(possiblyChangedItems);
+            return total + this.index(possiblyChangedItems, false);
         } catch (SQLException ex) {
             throw new DSpaceSolrIndexerException(ex.getMessage(), ex);
         }
@@ -266,7 +266,7 @@ private int indexAll() throws DSpaceSolrIndexerException {
                     null);
             Iterator<Item> nonDiscoverableItems = itemService
                     .findInArchiveOrWithdrawnNonDiscoverableModifiedSince(context, null);
-            return this.index(discoverableItems) + this.index(nonDiscoverableItems);
+            return this.index(discoverableItems, true) + this.index(nonDiscoverableItems, true);
         } catch (SQLException ex) {
             throw new DSpaceSolrIndexerException(ex.getMessage(), ex);
         }
@@ -309,7 +309,7 @@ private boolean checkIfVisibleInOAI(Item item) throws IOException {
         }
     }
 
-    private int index(Iterator<Item> iterator) throws DSpaceSolrIndexerException {
+    private int index(Iterator<Item> iterator, boolean uncacheEntities) throws DSpaceSolrIndexerException {
         try {
             int i = 0;
             int batchSize = configurationService.getIntProperty("oai.import.batch.size", 1000);
@@ -338,10 +338,12 @@ private int index(Iterator<Item> iterator) throws DSpaceSolrIndexerException {
                     server.add(list);
                     server.commit();
                     list.clear();
-                    try {
-                        context.uncacheEntities();
-                    } catch (SQLException ex) {
-                        log.error("Error uncaching entities", ex);
+                    if (uncacheEntities) {
+                        try {
+                            context.uncacheEntities();
+                        } catch (SQLException ex) {
+                            log.error("Error uncaching entities", ex);
+                        }
                     }
                 }
             }