Reindexing shouldn't stop unexpectedly

hapifhir · Jun 13, 2018 · a46b4a4 · a46b4a4
1 parent ed0b5f5
commit a46b4a4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -1338,7 +1338,7 @@ private void validateResourceTypeAndThrowIllegalArgumentException(IIdType theId)
 
 	@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
@@ -257,7 +257,7 @@ public Void doInTransaction(@Nonnull TransactionStatus theStatus) {
 	@Transactional(propagation = Propagation.NEVER)
 	public Integer performReindexingPass(final Integer theCount) {
 		if (!myReindexLock.tryLock()) {
-			return null;
+			return -1;
 		}
 		try {
 			return doPerformReindexingPass(theCount);