Merge OpenOLAT 8.4 to OpenOLAT 9.0 with 2f2a6abaea034f44671c9c1c6529c687e51ff300

src/main/java/org/olat/commons/coordinate/cluster/lock/ClusterLocker.java

@@ -179,6 +179,7 @@ public class ClusterLocker implements Locker, GenericEventListener {
 	 * Use 'releaseLock' as method to release a lock. 
 	 * @param lock  release this lockentry 
 	 */
+	@Override
 	public void releaseLockEntry(LockEntry lockEntry) {
 		String asset = lockEntry.getKey();
 		Identity releaseRequestor = lockEntry.getOwner();
@@ -193,7 +194,7 @@ public class ClusterLocker implements Locker, GenericEventListener {
 		} else {
 			// check that entry was previously locked by the same user that now wants to release the lock.
 			Identity ownwer = li.getOwner();
-			if (releaseRequestor.getName().equals(ownwer.getName())) {
+			if (releaseRequestor.getKey().equals(ownwer.getKey())) {
 				// delete the lock
 				clusterLockManager.deleteLock(li);
 			} else {

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

@@ -40,6 +40,7 @@ import org.apache.lucene.search.TopDocs;
 import org.apache.lucene.search.highlight.Highlighter;
 import org.apache.lucene.search.highlight.InvalidTokenOffsetsException;
 import org.apache.lucene.search.highlight.QueryScorer;
+import org.apache.lucene.search.highlight.SimpleHTMLEncoder;
 import org.apache.lucene.search.highlight.SimpleHTMLFormatter;
 import org.olat.core.commons.persistence.DBFactory;
 import org.olat.core.id.Identity;
@@ -255,7 +256,8 @@ public class SearchResultsImpl implements SearchResults {
 	 * @throws IOException
 	 */
 	private void doHighlight(Query query, Analyzer analyzer, Document doc, ResultDocument resultDocument) throws IOException {
-		Highlighter highlighter = new Highlighter(new SimpleHTMLFormatter(HIGHLIGHT_PRE_TAG,HIGHLIGHT_POST_TAG) , new QueryScorer(query));
+		Highlighter highlighter = new Highlighter(new SimpleHTMLFormatter(HIGHLIGHT_PRE_TAG,HIGHLIGHT_POST_TAG) ,
+				new SimpleHTMLEncoder(), new QueryScorer(query));
 		// Get 3 best fragments of content and seperate with a "..."
 		try {
 			//highlight content