cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject [1/5] git commit: updated refs/heads/4.2 to 622f076
Date Wed, 23 Oct 2013 12:45:51 GMT
Updated Branches:
  refs/heads/4.2 f4149ba0a -> 622f0762d


CLOUDSTACK-4931: Do not setDetails for system VMs


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/13a4ec36
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/13a4ec36
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/13a4ec36

Branch: refs/heads/4.2
Commit: 13a4ec366b0505893ecbc0487f037e37d8fae273
Parents: f4149ba
Author: Wei Zhou <w.zhou@leaseweb.com>
Authored: Wed Oct 23 14:08:23 2013 +0200
Committer: Wei Zhou <w.zhou@leaseweb.com>
Committed: Wed Oct 23 14:08:23 2013 +0200

----------------------------------------------------------------------
 pom.xml                                                | 3 ---
 server/src/com/cloud/vm/VirtualMachineManagerImpl.java | 8 +++++---
 2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13a4ec36/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a7c2099..7da0751 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,7 +174,6 @@
     <module>test</module>
     <module>client</module>
     <module>services</module>
-    <module>tools</module>
   </modules>
 
   <dependencyManagement>
@@ -511,9 +510,7 @@
       </properties>
       <modules>
         <module>developer</module>
-        <!--
         <module>tools</module>
--->
       </modules>
     </profile>
     <profile>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13a4ec36/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 354b3ab..1cb2f91 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -2470,9 +2470,11 @@ public class VirtualMachineManagerImpl extends ManagerBase implements
VirtualMac
         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 (userVm != null) {
+                _userVmDao.loadDetails(userVm);
+                userVm.setDetail("hypervisortoolsversion",  info.hvtoolsversion);
+                _userVmDao.saveDetails(userVm);
+            }
         }
 
         if (trackExternalChange) {


Mime
View raw message