You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2020/12/04 14:41:27 UTC

[openmeetings] 02/02: [OPENMEETINGS-2534] RSS widget should be fixed, rare corner case while room loading

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git

commit 7451ba7ac848ffffb05b8470e24922b3337e2c74
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Dec 4 21:41:11 2020 +0700

    [OPENMEETINGS-2534] RSS widget should be fixed, rare corner case while room loading
---
 .../java/org/apache/openmeetings/service/scheduler/AtomReader.java     | 3 ++-
 .../src/main/java/org/apache/openmeetings/web/room/RoomPanel.java      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/AtomReader.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/AtomReader.java
index 580b1ab..366e267 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/AtomReader.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/AtomReader.java
@@ -18,6 +18,7 @@
  */
 package org.apache.openmeetings.service.scheduler;
 
+import static org.apache.commons.text.StringEscapeUtils.escapeXml11;
 import static org.apache.openmeetings.core.rss.LoadAtomRssFeed.getFeedConnection;
 
 import java.io.IOException;
@@ -113,7 +114,7 @@ public class AtomReader {
 								}
 							}
 						} else if (f != null && evt.isCharacters()) {
-							val.append(((Characters)evt).getData());
+							val.append(escapeXml11(((Characters)evt).getData()));
 						} else if (f != null && evt.isEndElement() && f.getName().equals(((EndElement)evt).getName().getLocalPart())) {
 							if (!obj.has(f.getAlias())) {
 								obj.put(f.getAlias(), val.toString());
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index f79c1bb..af57e28 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -227,7 +227,7 @@ public class RoomPanel extends BasePanel {
 			super.onDownloadCompleted(target);
 			try {
 				Files.deleteIfExists(Paths.get(System.getProperty("java.io.tmpdir"), fuid));
-			} catch (IOException e) {
+			} catch (Exception e) {
 				log.error("unexcepted error while clean-up", e);
 			}
 			fuid = null;