You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/01/27 16:27:27 UTC
[1/2] git commit: updated refs/heads/master to b98a989
Repository: cloudstack
Updated Branches:
refs/heads/master de436acac -> b98a989e3
CLOUDSTACK-9196: Fixing null pointer exception when vm meta data is synced on
upgraded setup.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cbbec6f8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cbbec6f8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cbbec6f8
Branch: refs/heads/master
Commit: cbbec6f8e26b8a25a87aa0e841ad86cf6a8fe957
Parents: 7e12ebf
Author: Anshul Gangwar <an...@citrix.com>
Authored: Thu Jun 18 15:49:29 2015 +0530
Committer: Anshul Gangwar <an...@citrix.com>
Committed: Tue Dec 22 16:39:22 2015 +0530
----------------------------------------------------------------------
.../orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbbec6f8/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 5c58389..300475a 100644
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -2641,7 +2641,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
if(!found) {
VMInstanceVO vm = _vmDao.findVMByInstanceName(name);
- if(vm.getType() == VirtualMachine.Type.User) {
+ if(vm != null && vm.getType() == VirtualMachine.Type.User) {
updateVmMetaData(vm.getId(), platform);
}
}
[2/2] git commit: updated refs/heads/master to b98a989
Posted by bh...@apache.org.
Merge pull request #1274 from anshul1886/CLOUDSTACK-9196
CLOUDSTACK-9196: Fixing null pointer exception when vm meta data is synced on upgraded setuphttps://issues.apache.org/jira/browse/CLOUDSTACK-9196
NullPointerException can occur if XenServer reports non-existing VM in cloud DB.
* pr/1274:
CLOUDSTACK-9196: Fixing null pointer exception when vm meta data is synced on upgraded setup.
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b98a989e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b98a989e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b98a989e
Branch: refs/heads/master
Commit: b98a989e3d6eba5877cda3212bcb1e458dcaa40f
Parents: de436ac cbbec6f
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Jan 27 16:27:21 2016 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Jan 27 16:27:21 2016 +0100
----------------------------------------------------------------------
.../orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b98a989e/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------