Merge pull request #431 from UNC-Libraries/aggregate-indexing

Wait for aggregate default web object

Author: daines

services-worker/src/main/resources/solr-ingest-context.xml

@@ -61,7 +61,7 @@
 		<property name="accessControlService" ref="accessControlService" />
 		<property name="factory" ref="dipFactory" />
 		<property name="retryDelay" value="10000" />
-		<property name="maxRetries" value="3" />
+		<property name="maxRetries" value="6" />
 	</bean>
 
 	<!-- Ingest filters -->

solr-ingest/src/main/java/edu/unc/lib/dl/data/ingest/solr/indexing/DocumentIndexingPackageDataLoader.java

@@ -92,7 +92,7 @@ public Document loadFOXML(DocumentIndexingPackage dip) throws IndexingException
 						return foxml;
 					}
 
-				} catch (ServiceException e) {
+				} catch (ServiceException | NotFoundException e) {
 					// If there are retries left, retry on service exception
 					if (tries > 1) {
 						log.warn("Failed to retrieve FOXML for " + pid.getPid() + ", retrying.", e);