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 2017/11/17 07:16:51 UTC
openmeetings git commit: [OPENMEETINGS-1758] default port handling is
added
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x c6fc22f5e -> 52a59a9c4
[OPENMEETINGS-1758] default port handling is added
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/52a59a9c
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/52a59a9c
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/52a59a9c
Branch: refs/heads/4.0.x
Commit: 52a59a9c4e8f68146626ae4a56ab18a5fd4cc747
Parents: c6fc22f
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Nov 17 14:16:43 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Nov 17 14:16:43 2017 +0700
----------------------------------------------------------------------
.../src/main/java/org/apache/openmeetings/web/app/Application.java | 2 +-
.../src/main/java/org/apache/openmeetings/web/room/SwfPanel.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52a59a9c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 489bd52..8296f3b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -889,7 +889,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica
hazelWsTopic.publish(msg);
}
- private String getWsUrl(Url reqUrl) {
+ private static String getWsUrl(Url reqUrl) {
final boolean insecure = "http".equalsIgnoreCase(reqUrl.getProtocol());
String delim = ":";
String port = reqUrl.getPort() == null || reqUrl.getPort() < 0 ? "" : String.valueOf(reqUrl.getPort());
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52a59a9c/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
index e08e97b..c945b51 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
@@ -124,7 +124,7 @@ public class SwfPanel extends BasePanel {
.put("flashPort", gs.getBoolean(FLASH_SECURE) ? gs.getString(FLASH_SSL_PORT) : gs.getString(FLASH_PORT))
.put("proxy", gs.getBoolean(FLASH_NATIVE_SSL) ? "best" : "none")
.put("httpProtocol", url.getProtocol())
- .put("httpPort", url.getPort())
+ .put("httpPort", url.getPort() > -1 ? url.getPort() : url.getDefaultPort())
.put("host", url.getHost())
.put("path", path)
.put("width", "100%")