Repository: openmeetings Updated Branches: refs/heads/master 33e9b563a -> ee970f39a
no jira: flex connection to app level are denied Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/ee970f39 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/ee970f39 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/ee970f39 Branch: refs/heads/master Commit: ee970f39a73e1546f1d5b5ebe667b381bd958432 Parents: 33e9b56 Author: Maxim Solodovnik <[email protected]> Authored: Sat Sep 30 17:56:51 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sat Sep 30 17:56:51 2017 +0700 ---------------------------------------------------------------------- .../core/remote/ScopeApplicationAdapter.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ee970f39/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java index 5aee16e..14075ee 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java @@ -25,10 +25,10 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_HEADER_X import static org.apache.openmeetings.util.OpenmeetingsVariables.HEADER_CSP_SELF; import static org.apache.openmeetings.util.OpenmeetingsVariables.HEADER_XFRAME_SAMEORIGIN; import static org.apache.openmeetings.util.OpenmeetingsVariables.getExtProcessTtl; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWicketApplicationName; import static org.apache.openmeetings.util.OpenmeetingsVariables.setExtProcessTtl; import static org.apache.openmeetings.util.OpenmeetingsVariables.setInitComplete; -import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.util.ArrayList; import java.util.HashMap; @@ -65,6 +65,7 @@ import org.red5.server.api.IClient; import org.red5.server.api.IConnection; import org.red5.server.api.Red5; import org.red5.server.api.scope.IScope; +import org.red5.server.api.scope.ScopeType; import org.red5.server.api.service.IPendingServiceCall; import org.red5.server.api.service.IPendingServiceCallback; import org.red5.server.api.service.IServiceCapableConnection; @@ -155,6 +156,14 @@ public class ScopeApplicationAdapter extends MultiThreadedApplicationAdapter imp } @Override + public boolean appConnect(IConnection conn, Object[] params) { + if (conn != null && conn.getScope() != null && conn.getScope().getType() == ScopeType.APPLICATION) { + return false; + } + return super.appConnect(conn, params); + } + + @Override public boolean roomConnect(IConnection conn, Object[] params) { _log.debug("roomConnect : ");
