Merge OpenOLAT 12.1 to OpenOLAT default branch with 9cd56dba658da3550f2866a1d8f13d6fa8c93a4c

src/main/java/org/olat/course/certificate/manager/CertificatesManagerImpl.java

@@ -535,6 +535,10 @@ public class CertificatesManagerImpl implements CertificatesManager, MessageList
 	public List<CertificateLight> getLastCertificates(BusinessGroup businessGroup) {
 		List<BusinessGroup> groups = Collections.singletonList(businessGroup);
 		List<RepositoryEntry> entries = businessGroupRelationDao.findRepositoryEntries(groups, 0, -1);
+		if(entries.isEmpty()) {// no courses, no certificates
+			return new ArrayList<>();
+		}
+		
 		List<Long> resourceKeys = new ArrayList<>(entries.size());
 		for(RepositoryEntry entry:entries) {
 			resourceKeys.add(entry.getOlatResource().getKey());

src/main/java/org/olat/search/service/SearchServiceImpl.java

@@ -375,7 +375,7 @@ public class SearchServiceImpl implements SearchService, GenericEventListener {
 	private void cancelSearch(Future<?> search) {
 		if(search != null) {
 			try {
-				search.cancel(true);
+				search.cancel(false);
 			} catch (Exception e) {
 				log.error("Error canceling a search", e);
 			}