Tomas Jelinek has uploaded a new change for review. Change subject: userportal: error flow of RDP RdpPluginImpl broken ......................................................................
userportal: error flow of RDP RdpPluginImpl broken There were the following issues which caused the error not to be propagated: - a regression caused by 625b7452d840793df5e72764193c98c5ba121cdf which did bring back the crashing of IE if the RDP connection is not successful (originally fixed by fa10641c3484ea10d0b1b33ef8e3d656b5e6dd35). - by the same commit (625b7452d840793df5e72764193c98c5ba121cdf) the new method setParentModel has been introduced but it was not called. It caused a NPE on RdpPluginImpl.rdpDisconnected:66. Fixed by calling this method on the relevant places. This patch differs from the 34d4bbcbe8f01297b8770bf69b445b08dcf1b1f7 from which is this backported in a way that the AbstractRdp.getUserPassword already handles the null correctly in this branch (e.g. no change required in this class). Change-Id: I85fc3b32c4f544f23864db2aefa5ebcd4d896b75 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1014710 Signed-off-by: Tomas Jelinek <tjeli...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractRdp.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/RdpPluginImpl.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RdpConsoleModel.java 3 files changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/18/21118/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractRdp.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractRdp.java index c47ba7d..9ce8aa8 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractRdp.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractRdp.java @@ -32,7 +32,7 @@ public String getVdcUserPassword() { String password = Frontend.getLoggedInUser().getPassword(); - return password == null ? "" : password; + return password == null ? "" : password; //$NON-NLS-1$ } public String getVdcUserDomainController() { diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/RdpPluginImpl.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/RdpPluginImpl.java index 578eb18..a87a28d 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/RdpPluginImpl.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/RdpPluginImpl.java @@ -126,7 +126,6 @@ var extendedDiscReason = MsRdpClient.ExtendedDisconnectReason; var errorCodeEventArgs = @org.ovirt.engine.ui.uicommonweb.models.vms.ErrorCodeEventArgs::new(I)(disconnectCode); disconnectedeve...@org.ovirt.engine.ui.uicompat.Event::raise(Ljava/lang/Object;Lorg/ovirt/engine/ui/uicompat/EventArgs;)(model, errorCodeEventArgs); - $wnd.document.body.removeChild(MsRdpClient); } MsRdpClient.attachEvent('OnConnected', OnConnected); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RdpConsoleModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RdpConsoleModel.java index 216e792..f92c6a1 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RdpConsoleModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RdpConsoleModel.java @@ -35,10 +35,13 @@ setrdp((IRdp) TypeResolver.getInstance().resolve(IRdpNative.class)); break; case Plugin: - setrdp((IRdp) TypeResolver.getInstance().resolve(IRdpPlugin.class)); + IRdpPlugin plugin = (IRdpPlugin) TypeResolver.getInstance().resolve(IRdpPlugin.class); + plugin.setParentModel(this); + setrdp(plugin); break; default: IRdpPlugin impl = (IRdpPlugin) TypeResolver.getInstance().resolve(IRdpPlugin.class); + impl.setParentModel(this); setrdp(consoleUtils.isBrowserPluginSupported(ConsoleProtocol.RDP) ? impl : (IRdp) TypeResolver.getInstance().resolve(IRdpNative.class)); break; -- To view, visit http://gerrit.ovirt.org/21118 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I85fc3b32c4f544f23864db2aefa5ebcd4d896b75 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Tomas Jelinek <tjeli...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
