Frank Kobzik has posted comments on this change. Change subject: frontend: Use GraphicsInfo instead of VmDynamic atts ......................................................................
Patch Set 24: (5 comments) http://gerrit.ovirt.org/#/c/28573/24/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java File frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java: Line 365: : null); Line 366: getspice().setSmartcardEnabled(getEntity().isSmartcardEnabled()); Line 367: Integer port = spiceInfo != null Line 368: ? spiceInfo.getPort() Line 369: : null; > I don't think it makes sense to try to connect to host "null". In case the Done Line 370: getspice().setPort(port == null ? 0 : port); Line 371: getspice().setPassword(ticket); Line 372: getspice().setTicketValiditySeconds(TICKET_VALIDITY_SECONDS); Line 373: getspice().setNumberOfMonitors(getEntity().getNumOfMonitors()); Line 371: getspice().setPassword(ticket); Line 372: getspice().setTicketValiditySeconds(TICKET_VALIDITY_SECONDS); Line 373: getspice().setNumberOfMonitors(getEntity().getNumOfMonitors()); Line 374: getspice().setGuestHostName(getEntity().getVmHost().split("[ ]", -1)[0]); //$NON-NLS-1$ Line 375: if (spiceInfo != null && spiceInfo.getTlsPort() != null) { > so no need to check it here. Done Line 376: getspice().setSecurePort(spiceInfo.getTlsPort()); Line 377: } Line 378: if (!StringHelper.isNullOrEmpty(spiceSecureChannels)) { Line 379: getspice().setSslChanels(spiceSecureChannels); Line 461: // Subscribe to events. Line 462: getspice().getDisconnectedEvent().addListener(this); Line 463: getspice().getMenuItemSelectedEvent().addListener(this); Line 464: Line 465: String displayIp = spiceInfo != null > same Done Line 466: ? spiceInfo.getIp() Line 467: : null; Line 468: if (StringHelper.isNullOrEmpty(displayIp) || "0".equals(displayIp)) { //$NON-NLS-1$ Line 469: determineIpAndConnect(getEntity().getId()); http://gerrit.ovirt.org/#/c/28573/24/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VncConsoleModel.java File frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VncConsoleModel.java: Line 137: Line 138: Frontend.getInstance().runQuery(VdcQueryType.GetManagementInterfaceAddressByVmId, Line 139: new IdQueryParameters(getEntity().getId()), _asyncQuery); Line 140: } else { Line 141: VncConsoleModel.this.host = vncInfo != null > this can not happen, you do the check in the if statement Done Line 142: ? vncInfo.getIp() Line 143: : null; Line 144: setAndInvokeClient(); Line 145: } Line 153: Map<GraphicsType, GraphicsInfo> vncInfo = getEntity().getGraphicsInfos(); Line 154: Integer port = vncInfo != null Line 155: ? vncInfo.get(GraphicsType.VNC).getPort() Line 156: : null; Line 157: vncImpl.setVncPort(port == null ? null : port.toString()); > same Done Line 158: vncImpl.setTicket(getOtp64()); Line 159: vncImpl.setTitle(getClientTitle()); Line 160: vncImpl.setToggleFullscreenHotKey(getToggleFullScreenKeys()); Line 161: vncImpl.setReleaseCursorHotKey(getReleaseCursorKeys()); -- To view, visit http://gerrit.ovirt.org/28573 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iae7d8a7a4b4cdd801ecf3c9c055c8a56aa796286 Gerrit-PatchSet: 24 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <fkob...@redhat.com> Gerrit-Reviewer: Frank Kobzik <fkob...@redhat.com> Gerrit-Reviewer: Tomas Jelinek <tjeli...@redhat.com> Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
