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 2015/01/30 07:50:02 UTC
svn commit: r1655944 - in /openmeetings:
branches/3.0.x/src/main/java/org/apache/openmeetings/remote/
branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/
trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remo...
Author: solomax
Date: Fri Jan 30 06:50:02 2015
New Revision: 1655944
URL: http://svn.apache.org/r1655944
Log:
Additional synchronized methods are removed
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java?rev=1655944&r1=1655943&r2=1655944&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java Fri Jan 30 06:50:02 2015
@@ -169,7 +169,8 @@ public class FLVRecorderService implemen
&& (rcl.getAvsettings().equals("av") || rcl.getAvsettings().equals("a") || rcl.getAvsettings().equals("v"))) {
// if the user does publish av, a, v
// But we only record av or a, video only is not interesting
- String streamName = generateFileName(flvRecordingId, String.valueOf(rcl.getBroadCastID()).toString());
+ String broadcastId = "" + rcl.getBroadCastID();
+ String streamName = generateFileName(flvRecordingId, broadcastId);
// Add Meta Data
boolean isAudioOnly = false;
@@ -191,8 +192,7 @@ public class FLVRecorderService implemen
sessionManager.updateClientByStreamId(rcl.getStreamid(), rcl, false, null);
// Start FLV recording
- recordShow(conn, String.valueOf(rcl.getBroadCastID()).toString(), streamName, metaId, !isAudioOnly,
- isInterview);
+ recordShow(conn, broadcastId, streamName, metaId, !isAudioOnly, isInterview);
}
}
}
@@ -214,7 +214,7 @@ public class FLVRecorderService implemen
* @param metaId
* @throws Exception
*/
- private synchronized void recordShow(IConnection conn, String broadcastid, String streamName, Long metaId, boolean isScreenData, Boolean isInterview) throws Exception {
+ private void recordShow(IConnection conn, String broadcastid, String streamName, Long metaId, boolean isScreenData, Boolean isInterview) throws Exception {
try {
log.debug("Recording show for: " + conn.getScope().getContextPath());
log.debug("Name of CLient and Stream to be recorded: " + broadcastid);
Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1655944&r1=1655943&r2=1655944&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java Fri Jan 30 06:50:02 2015
@@ -278,7 +278,7 @@ public class ScopeApplicationAdapter ext
*
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
- public synchronized Map setConnectionAsSharingClient(Map map) {
+ public Map setConnectionAsSharingClient(Map map) {
try {
log.debug("----------- setConnectionAsSharingClient");
IConnection current = Red5.getConnectionLocal();
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java?rev=1655944&r1=1655943&r2=1655944&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java Fri Jan 30 06:50:02 2015
@@ -167,7 +167,8 @@ public class FLVRecorderService implemen
&& (rcl.getAvsettings().equals("av") || rcl.getAvsettings().equals("a") || rcl.getAvsettings().equals("v"))) {
// if the user does publish av, a, v
// But we only record av or a, video only is not interesting
- String streamName = generateFileName(flvRecordingId, String.valueOf(rcl.getBroadCastID()).toString());
+ String broadcastId = "" + rcl.getBroadCastID();
+ String streamName = generateFileName(flvRecordingId, broadcastId);
// Add Meta Data
boolean isAudioOnly = false;
@@ -189,8 +190,7 @@ public class FLVRecorderService implemen
sessionManager.updateClientByStreamId(rcl.getStreamid(), rcl, false, null);
// Start FLV recording
- recordShow(conn, String.valueOf(rcl.getBroadCastID()).toString(), streamName, metaId, !isAudioOnly,
- isInterview);
+ recordShow(conn, broadcastId, streamName, metaId, !isAudioOnly, isInterview);
}
}
}
@@ -212,7 +212,7 @@ public class FLVRecorderService implemen
* @param metaId
* @throws Exception
*/
- private synchronized void recordShow(IConnection conn, String broadcastid, String streamName, Long metaId, boolean isScreenData, Boolean isInterview) throws Exception {
+ private void recordShow(IConnection conn, String broadcastid, String streamName, Long metaId, boolean isScreenData, Boolean isInterview) throws Exception {
try {
log.debug("Recording show for: " + conn.getScope().getContextPath());
log.debug("Name of CLient and Stream to be recorded: " + broadcastid);
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1655944&r1=1655943&r2=1655944&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Fri Jan 30 06:50:02 2015
@@ -269,7 +269,7 @@ public class ScopeApplicationAdapter ext
*
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
- public synchronized Map setConnectionAsSharingClient(Map map) {
+ public Map setConnectionAsSharingClient(Map map) {
try {
log.debug("----------- setConnectionAsSharingClient");
IConnection current = Red5.getConnectionLocal();