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/08 09:47:47 UTC
openmeetings git commit: [OPENMEETINGS-1747] boolean is inverted
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x 1ec81a934 -> 81efc3123
[OPENMEETINGS-1747] boolean is inverted
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/81efc312
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/81efc312
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/81efc312
Branch: refs/heads/4.0.x
Commit: 81efc3123b4149a50559c316b97b1bcb0c4288ae
Parents: 1ec81a9
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Nov 8 16:47:40 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Nov 8 16:47:40 2017 +0700
----------------------------------------------------------------------
.../main/java/org/apache/openmeetings/web/app/Application.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81efc312/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 25d6828..489bd52 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
@@ -890,17 +890,17 @@ public class Application extends AuthenticatedWebApplication implements IApplica
}
private String getWsUrl(Url reqUrl) {
- final boolean secure = "http".equalsIgnoreCase(reqUrl.getProtocol());
+ final boolean insecure = "http".equalsIgnoreCase(reqUrl.getProtocol());
String delim = ":";
String port = reqUrl.getPort() == null || reqUrl.getPort() < 0 ? "" : String.valueOf(reqUrl.getPort());
- if (!port.isEmpty() && ((secure && 443 == reqUrl.getPort()) || (!secure && 80 == reqUrl.getPort()))) {
+ if (!port.isEmpty() && ((insecure && 80 == reqUrl.getPort()) || (!insecure && 443 == reqUrl.getPort()))) {
port = "";
}
if (port.isEmpty()) {
delim = "";
}
return String.format("%s://%s%s%s;"
- , secure ? "ws" : "wss"
+ , insecure ? "ws" : "wss"
, reqUrl.getHost()
, delim
, port);