Tomas Jelinek has uploaded a new change for review. Change subject: frontend: SPICE port is sent as 65535 to spice_html5 ......................................................................
frontend: SPICE port is sent as 65535 to spice_html5 Regression introduced by ece8952062f708245ddc527987eeb9c00d3b3fc4 where the check securePort == -1 ? false : true has been replaced by consoleOptions.getSecurePort(). The problem is that the securePort has been used instead of getSecurePort intentionally since the getter returns "securePort & 0xffff" not to send negative value to the spice client. Fixed by providing also a getter to get the raw walue Change-Id: I65a8393a465ebee988f03ec56efa0319626fa0e1 Bug-Url: https://bugzilla.redhat.com/1210379 Signed-off-by: Tomas Jelinek <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/console/ConsoleOptions.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceHtml5Impl.java 2 files changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/78/40578/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/console/ConsoleOptions.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/console/ConsoleOptions.java index d9c33a8..7672c62 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/console/ConsoleOptions.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/console/ConsoleOptions.java @@ -201,6 +201,10 @@ this.securePort = securePort; } + public int getRawSecurePort() { + return securePort; + } + public String getSslChanels() { return sslChanels; } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceHtml5Impl.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceHtml5Impl.java index ecf3cc2..aac159e 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceHtml5Impl.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceHtml5Impl.java @@ -14,7 +14,7 @@ @Override public void invokeClient() { - boolean sslTarget = consoleOptions.getSecurePort() != -1; + boolean sslTarget = consoleOptions.getRawSecurePort() != -1; int port = sslTarget ? consoleOptions.getSecurePort() : consoleOptions.getPort(); WebClientConsoleInvoker invoker = new WebClientConsoleInvoker(CLIENT_PAGE, getConfig(), getOptions().getHost(), port, getOptions().getTicket(), sslTarget); invoker.invokeClient(); -- To view, visit https://gerrit.ovirt.org/40578 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I65a8393a465ebee988f03ec56efa0319626fa0e1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
