Author: solomax
Date: Wed May 18 04:25:44 2016
New Revision: 1744351
URL: http://svn.apache.org/viewvc?rev=1744351&view=rev
Log:
[OPENMEETINGS-1402] UTF-8 charset is set for jnlp stream
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java?rev=1744351&r1=1744350&r2=1744351&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
Wed May 18 04:25:44 2016
@@ -131,7 +131,9 @@ public class StartSharingEventBehavior e
} catch (Exception e) {
log.error("Unexpected error while creating jnlp file",
e);
}
- download.setResourceStream(new StringResourceStream(app,
"application/x-java-jnlp-file"));
+ StringResourceStream srs = new StringResourceStream(app,
"application/x-java-jnlp-file");
+ srs.setCharset(StandardCharsets.UTF_8);
+ download.setResourceStream(srs);
download.initiate(target);
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java?rev=1744351&r1=1744350&r2=1744351&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
Wed May 18 04:25:44 2016
@@ -129,7 +129,9 @@ public class StartSharingButton extends
} catch (Exception e) {
log.error("Unexpected error while creating jnlp file",
e);
}
- download.setResourceStream(new StringResourceStream(app,
"application/x-java-jnlp-file"));
+ StringResourceStream srs = new StringResourceStream(app,
"application/x-java-jnlp-file");
+ srs.setCharset(StandardCharsets.UTF_8);
+ download.setResourceStream(srs);
download.initiate(target);
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java?rev=1744351&r1=1744350&r2=1744351&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
Wed May 18 04:25:44 2016
@@ -129,7 +129,9 @@ public class StartSharingButton extends
} catch (Exception e) {
log.error("Unexpected error while creating jnlp file",
e);
}
- download.setResourceStream(new StringResourceStream(app,
"application/x-java-jnlp-file"));
+ StringResourceStream srs = new StringResourceStream(app,
"application/x-java-jnlp-file");
+ srs.setCharset(StandardCharsets.UTF_8);
+ download.setResourceStream(srs);
download.initiate(target);
}
