Merge OpenOLAT 12.1 to OpenOLAT default branch with 6a31d21329663e2094fd77a1a6ac257b8bdfc825

.hgtags

@@ -198,3 +198,4 @@ cd13b2d55dde9f3f3ba9f31e10f9d02493740891 OpenOLAT 12.1.0
 90e4eea2b8b7c50c8f89e9c52174a51010cf375f OpenOLAT 12.1.0
 7889575e549c06a491840f62134afa065afb50ae OpenOLAT 12.1.1
 eb6b3df62c5f776cc86dd5221bdf2fea9a87d9cb OpenOLAT 12.1.2
+8de46abaab44970cafb8da0f434bb87cb4fa2171 OpenOLAT 12.1.3

src/main/java/org/olat/modules/lecture/LectureModule.java

@@ -151,6 +151,16 @@ public class LectureModule extends AbstractSpringModule implements ConfigOnOff {
 			absenceDefaultAuthorized = "true".equals(absenceDefaultAuthorizedObj);
 		}
 		
+		String teacherCanAuthorizedAbsenceObj = getStringPropertyValue(TEACHER_CAN_AUTHORIZED_ABSENCE, true);
+		if(StringHelper.containsNonWhitespace(teacherCanAuthorizedAbsenceObj)) {
+			teacherCanAuthorizedAbsence = "true".equals(teacherCanAuthorizedAbsenceObj);
+		}
+		
+		String rollCallReminderEnabledObj = getStringPropertyValue(ROLLCALL_REMINDER_ENABLED, true);
+		if(StringHelper.containsNonWhitespace(rollCallReminderEnabledObj)) {
+			rollCallReminderEnabled = "true".equals(rollCallReminderEnabledObj);
+		}
+		
 		String rollcallReminderPeriodObj = getStringPropertyValue(ROLLCALL_REMINDER_PERIOD, true);
 		if(StringHelper.containsNonWhitespace(rollcallReminderPeriodObj)) {
 			rollCallReminderPeriod = Integer.parseInt(rollcallReminderPeriodObj);

src/main/java/org/olat/search/_spring/searchContext.xml

@@ -331,7 +331,9 @@
 	<!-- OO-109: bypass the JMS server in no-cluster environment ==> use searchClientLocal if singleVM -->	
 	<alias alias="searchClient" name="searchClient${cluster.mode}"/>
 
-	<bean id="searchClientSingleVM" class="org.olat.search.service.searcher.SearchClientLocal"/>
+	<bean id="searchClientSingleVM" class="org.olat.search.service.searcher.SearchClientLocal">
+		<property name="dbInstance" ref="database" />
+	</bean>
 	
 	<bean id="searchClientCluster" class="org.olat.search.service.searcher.SearchClientProxy" init-method="springInit" destroy-method="stop" lazy-init="true">
 		<property name="connectionFactory" ref="searchConnectionFactory"/>

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

@@ -35,6 +35,8 @@ import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.lucene.analysis.Analyzer;
@@ -303,10 +305,10 @@ public class SearchServiceImpl implements SearchService, GenericEventListener {
 		try {
 			SearchCallable run = new SearchCallable(queryString,  condQueries, identity, roles, firstResult, maxResults, doHighlighting, this);
 			Future<SearchResults> futureResults = searchExecutor.submit(run);
-			SearchResults results = futureResults.get();
+			SearchResults results = futureResults.get(30, TimeUnit.SECONDS);
 			queryCount++;
 			return results;
-		} catch (InterruptedException e) {
+		} catch (InterruptedException | TimeoutException e) {
 			log.error("", e);
 			return null;
 		} catch (ExecutionException e) {
@@ -328,7 +330,7 @@ public class SearchServiceImpl implements SearchService, GenericEventListener {
 		try {
 			SearchOrderByCallable run = new SearchOrderByCallable(queryString, condQueries, orderBy, firstResult, maxResults, this);
 			Future<List<Long>> futureResults = searchExecutor.submit(run);
-			List<Long> results = futureResults.get();
+			List<Long> results = futureResults.get(30, TimeUnit.SECONDS);
 			queryCount++;
 			if(results == null) {
 				results = new ArrayList<Long>(1);

src/main/java/org/olat/search/service/searcher/SearchClientLocal.java

@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.lucene.queryparser.classic.ParseException;
+import org.olat.core.commons.persistence.DB;
 import org.olat.core.commons.persistence.SortKey;
 import org.olat.core.id.Identity;
 import org.olat.core.id.Roles;
@@ -42,11 +43,22 @@ import org.olat.search.service.SearchServiceFactory;
  * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
  */
 public class SearchClientLocal implements SearchClient {
+	
+	private DB dbInstance;
+	
+	/**
+	 * [used by Spring]
+	 * @param dbInstance
+	 */
+	public void setDbInstance(DB dbInstance) {
+		this.dbInstance = dbInstance;
+	}
 
 	@Override
 	public SearchResults doSearch(String queryString, List<String> condQueries, Identity identity, Roles roles,
 			int firstResult, int maxReturns, boolean doHighlighting)
 	throws ServiceNotAvailableException, ParseException, QueryException {
+		dbInstance.commitAndCloseSession();
 		return SearchServiceFactory.getService().doSearch(queryString, condQueries, identity, roles, firstResult, maxReturns, doHighlighting);
 	}
 
@@ -54,11 +66,13 @@ public class SearchClientLocal implements SearchClient {
 	public List<Long> doSearch(String queryString, List<String> condQueries, Identity identity, Roles roles,
 			int firstResult, int maxResults, SortKey... orderBy)
 	throws ServiceNotAvailableException, ParseException, QueryException {
+		dbInstance.commitAndCloseSession();
 		return SearchServiceFactory.getService().doSearch(queryString, condQueries, identity, roles, firstResult, maxResults, orderBy);
 	}
 
 	@Override
 	public Set<String> spellCheck(String query) throws ServiceNotAvailableException {
+		dbInstance.commitAndCloseSession();
 		return SearchServiceFactory.getService().spellCheck(query);
 	}
 }