Tomas Jelinek has uploaded a new change for review. Change subject: userportal,webadmin: disable SPICE proxy has no effect ......................................................................
userportal,webadmin: disable SPICE proxy has no effect Edit console dialog -> enable SPICE proxy -> connect to VM-> edit console dialog again -> disable SPICE proxy -> connect to VM After this, the SPICE will connect to the VM using the proxy, because it remembered it from the previous setting. Fixed by resetting the Proxy property if the proxy is not enabled. Change-Id: I5931b4242bdba7755e29c3942a1df2eab03f7b5f Bug-Url: https://bugzilla.redhat.com/924605 Signed-off-by: Tomas Jelinek <tjeli...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpicePluginImpl.java 1 file changed, 10 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/13937/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpicePluginImpl.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpicePluginImpl.java index 56bbf17..b29f65a 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpicePluginImpl.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpicePluginImpl.java @@ -165,10 +165,14 @@ client.DisableEffects = disableEffects; client.ColorDepth = colorDepth; } - // set it only if the proxy is defined in VDC_OPTIONS + + // only if the proxy is defined in VDC_OPTIONS if (spiceProxy != null) { - client.Proxy = spiceProxy + client.Proxy = spiceProxy; + } else { + client.Proxy = ''; } + client.connect(); connectedeve...@org.ovirt.engine.ui.uicompat.Event::raise(Ljava/lang/Object;Lorg/ovirt/engine/ui/uicompat/EventArgs;)(model, null); @@ -314,9 +318,11 @@ client.ColorDepth = colorDepth; } - // only if the proxy is defined in VDC_OPTIONS + // only if the proxy is defined in VDC_OPTIONS if (spiceProxy != null) { - client.Proxy = spiceProxy + client.Proxy = spiceProxy; + } else { + client.Proxy = ''; } client.attachEvent('ondisconnected', onDisconnected); -- To view, visit http://gerrit.ovirt.org/13937 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5931b4242bdba7755e29c3942a1df2eab03f7b5f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <tjeli...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
