From a46b4a4637bd6abe609c936393e56a23368295fe Mon Sep 17 00:00:00 2001
From: James Agnew <jamesagnew@gmail.com>
Date: Wed, 13 Jun 2018 22:03:15 +0800
Subject: [PATCH] Reindexing shouldn't stop unexpectedly

---
 .../main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java  | 2 +-
 .../main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirSystemDao.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java
index 6cff70e1f1e..0b5a6f6ef93 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java
@@ -1338,7 +1338,7 @@ public abstract class BaseHapiFhirResourceDao<T extends IBaseResource> extends B
 
 	@PostConstruct
 	public void start() {
-		ourLog.info("Starting resource DAO for type: {}", getResourceName());
+		ourLog.debug("Starting resource DAO for type: {}", getResourceName());
 	}
 
 }
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirSystemDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirSystemDao.java
index 58d9d74ad1c..71696321fdb 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirSystemDao.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirSystemDao.java
@@ -257,7 +257,7 @@ public abstract class BaseHapiFhirSystemDao<T, MT> extends BaseHapiFhirDao<IBase
 	@Transactional(propagation = Propagation.NEVER)
 	public Integer performReindexingPass(final Integer theCount) {
 		if (!myReindexLock.tryLock()) {
-			return null;
+			return -1;
 		}
 		try {
 			return doPerformReindexingPass(theCount);