Author: solomax
Date: Wed Oct 12 05:20:38 2016
New Revision: 1764379
URL: http://svn.apache.org/viewvc?rev=1764379&view=rev
Log:
[OPENMEETINGS-1482] redundant synchronisation is removed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1764379&r1=1764378&r2=1764379&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Wed Oct 12 05:20:38 2016
@@ -64,7 +64,7 @@ import org.apache.openmeetings.util.Vers
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
-import org.red5.server.adapter.ApplicationAdapter;
+import org.red5.server.adapter.MultiThreadedApplicationAdapter;
import org.red5.server.api.IClient;
import org.red5.server.api.IConnection;
import org.red5.server.api.Red5;
@@ -79,7 +79,7 @@ import org.red5.server.api.stream.IBroad
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
-public class ScopeApplicationAdapter extends ApplicationAdapter implements
IPendingServiceCallback {
+public class ScopeApplicationAdapter extends MultiThreadedApplicationAdapter
implements IPendingServiceCallback {
private static final Logger log =
Red5LoggerFactory.getLogger(ScopeApplicationAdapter.class, webAppRootKey);
private static final String SECURITY_CODE_PARAM = "securityCode";
private static final String NATIVE_SSL_PARAM = "nativeSsl";
@@ -1508,7 +1508,7 @@ public class ScopeApplicationAdapter ext
* @return 1
*/
@SuppressWarnings({ "rawtypes" })
- public synchronized int sendBrowserMessageToMembers(Object newMessage) {
+ public int sendBrowserMessageToMembers(Object newMessage) {
try {
IConnection current = Red5.getConnectionLocal();
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1764379&r1=1764378&r2=1764379&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Wed Oct 12 05:20:38 2016
@@ -75,7 +75,7 @@ import org.apache.wicket.protocol.ws.api
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
-import org.red5.server.adapter.ApplicationAdapter;
+import org.red5.server.adapter.MultiThreadedApplicationAdapter;
import org.red5.server.api.IClient;
import org.red5.server.api.IConnection;
import org.red5.server.api.Red5;
@@ -90,7 +90,7 @@ import org.red5.server.api.stream.IBroad
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
-public class ScopeApplicationAdapter extends ApplicationAdapter implements
IPendingServiceCallback {
+public class ScopeApplicationAdapter extends MultiThreadedApplicationAdapter
implements IPendingServiceCallback {
private static final Logger log =
Red5LoggerFactory.getLogger(ScopeApplicationAdapter.class, webAppRootKey);
private static final String SECURITY_CODE_PARAM = "securityCode";
private static final String NATIVE_SSL_PARAM = "nativeSsl";
@@ -1571,7 +1571,7 @@ public class ScopeApplicationAdapter ext
* @return 1
*/
@SuppressWarnings({ "rawtypes" })
- public synchronized int sendBrowserMessageToMembers(Object newMessage) {
+ public int sendBrowserMessageToMembers(Object newMessage) {
try {
IConnection current = Red5.getConnectionLocal();
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1764379&r1=1764378&r2=1764379&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Wed Oct 12 05:20:38 2016
@@ -75,7 +75,7 @@ import org.apache.wicket.protocol.ws.api
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
-import org.red5.server.adapter.ApplicationAdapter;
+import org.red5.server.adapter.MultiThreadedApplicationAdapter;
import org.red5.server.api.IClient;
import org.red5.server.api.IConnection;
import org.red5.server.api.Red5;
@@ -90,7 +90,7 @@ import org.red5.server.api.stream.IBroad
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
-public class ScopeApplicationAdapter extends ApplicationAdapter implements
IPendingServiceCallback {
+public class ScopeApplicationAdapter extends MultiThreadedApplicationAdapter
implements IPendingServiceCallback {
private static final Logger log =
Red5LoggerFactory.getLogger(ScopeApplicationAdapter.class, webAppRootKey);
private static final String SECURITY_CODE_PARAM = "securityCode";
private static final String NATIVE_SSL_PARAM = "nativeSsl";
@@ -1571,7 +1571,7 @@ public class ScopeApplicationAdapter ext
* @return 1
*/
@SuppressWarnings({ "rawtypes" })
- public synchronized int sendBrowserMessageToMembers(Object newMessage) {
+ public int sendBrowserMessageToMembers(Object newMessage) {
try {
IConnection current = Red5.getConnectionLocal();
