Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5E9EF10DBB for ; Thu, 24 Oct 2013 18:35:33 +0000 (UTC) Received: (qmail 80188 invoked by uid 500); 24 Oct 2013 18:32:22 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 79440 invoked by uid 500); 24 Oct 2013 18:31:09 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 78996 invoked by uid 99); 24 Oct 2013 18:30:40 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Oct 2013 18:30:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5279181C027; Thu, 24 Oct 2013 18:30:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Date: Thu, 24 Oct 2013 18:30:47 -0000 Message-Id: <166bb0bea11547d6971ad6210a549ca6@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [09/50] [abbrv] git commit: updated refs/heads/ui-restyle to 500c798 CLOUDSTACK-4931, CLOUDSTACK-4937: setDetails to user VMs only (cherry picked from commit a94acc5a43aeaf5f18f1912e2653a92f6041a6e5) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/69b131fa Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/69b131fa Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/69b131fa Branch: refs/heads/ui-restyle Commit: 69b131fa1501ed7f6950a6dae4161efb659ad113 Parents: 294b0c7 Author: Wei Zhou Authored: Wed Oct 23 16:55:10 2013 +0200 Committer: Wei Zhou Committed: Wed Oct 23 17:04:02 2013 +0200 ---------------------------------------------------------------------- .../com/cloud/vm/VirtualMachineManagerImpl.java | 41 ++++++++++++-------- 1 file changed, 24 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/69b131fa/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java index aa5af54..c2242c7 100755 --- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -887,10 +887,12 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac if ( answer != null ) { String hypervisortoolsversion = answer.getHypervisorToolsVersion(); if (hypervisortoolsversion != null) { - UserVmVO userVm = _userVmDao.findById(vm.getId()); - _userVmDao.loadDetails(userVm); - userVm.setDetail("hypervisortoolsversion", hypervisortoolsversion); - _userVmDao.saveDetails(userVm); + if (vm.getType() == VirtualMachine.Type.User) { + UserVmVO userVm = _userVmDao.findById(vm.getId()); + _userVmDao.loadDetails(userVm); + userVm.setDetail("hypervisortoolsversion", hypervisortoolsversion); + _userVmDao.saveDetails(userVm); + } } } @@ -1003,10 +1005,12 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac if ( answer != null ) { String hypervisortoolsversion = answer.getHypervisorToolsVersion(); if (hypervisortoolsversion != null) { - UserVmVO userVm = _userVmDao.findById(vm.getId()); - _userVmDao.loadDetails(userVm); - userVm.setDetail("hypervisortoolsversion", hypervisortoolsversion); - _userVmDao.saveDetails(userVm); + if (vm.getType() == VirtualMachine.Type.User) { + UserVmVO userVm = _userVmDao.findById(vm.getId()); + _userVmDao.loadDetails(userVm); + userVm.setDetail("hypervisortoolsversion", hypervisortoolsversion); + _userVmDao.saveDetails(userVm); + } } } if (!answer.getResult()) { @@ -1208,10 +1212,12 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac if ( answer != null ) { String hypervisortoolsversion = answer.getHypervisorToolsVersion(); if (hypervisortoolsversion != null) { - UserVmVO userVm = _userVmDao.findById(vm.getId()); - _userVmDao.loadDetails(userVm); - userVm.setDetail("hypervisortoolsversion", hypervisortoolsversion); - _userVmDao.saveDetails(userVm); + if (vm.getType() == VirtualMachine.Type.User) { + UserVmVO userVm = _userVmDao.findById(vm.getId()); + _userVmDao.loadDetails(userVm); + userVm.setDetail("hypervisortoolsversion", hypervisortoolsversion); + _userVmDao.saveDetails(userVm); + } } } stopped = answer.getResult(); @@ -2296,11 +2302,12 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } // track hypervsion tools version if( info.hvtoolsversion != null && !info.hvtoolsversion.isEmpty() ) { - - UserVmVO userVm = _userVmDao.findById(vm.getId()); - _userVmDao.loadDetails(userVm); - userVm.setDetail("hypervisortoolsversion", info.hvtoolsversion); - _userVmDao.saveDetails(userVm); + if (vm.getType() == VirtualMachine.Type.User) { + UserVmVO userVm = _userVmDao.findById(vm.getId()); + _userVmDao.loadDetails(userVm); + userVm.setDetail("hypervisortoolsversion", info.hvtoolsversion); + _userVmDao.saveDetails(userVm); + } } if (trackExternalChange) {