Updated Branches:
refs/heads/master c618caf10 -> d6cb95208
CLOUDSTACK-3554: NPE while attaching VMWARE Tools ISO to the instance
Description:
Account for null imagestore for vmware-tools iso.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d6cb9520
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d6cb9520
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d6cb9520
Branch: refs/heads/master
Commit: d6cb95208bbd3d22fedc1868e804dac3cba9bf06
Parents: c618caf
Author: Vijayendra Bhamidipati <vijayendra.bhamidip...@citrix.com>
Authored: Wed Jul 17 10:23:51 2013 -0700
Committer: Sheng Yang <sheng.y...@citrix.com>
Committed: Wed Jul 17 16:58:51 2013 -0700
----------------------------------------------------------------------
.../src/com/cloud/storage/resource/VmwareStorageProcessor.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d6cb9520/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
----------------------------------------------------------------------
diff --git
a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
index 4113803..3436c5b 100644
---
a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
+++
b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -869,7 +869,9 @@ public class VmwareStorageProcessor implements
StorageProcessor {
}
TemplateObjectTO iso = (TemplateObjectTO)disk.getData();
NfsTO nfsImageStore = (NfsTO)iso.getDataStore();
- String storeUrl = nfsImageStore.getUrl();
+ String storeUrl = null;
+ if (nfsImageStore != null)
+ storeUrl = nfsImageStore.getUrl();
if (storeUrl == null) {
if
(!iso.getName().equalsIgnoreCase("vmware-tools.iso")) {
String msg = "ISO store root url is not found in
AttachIsoCommand";
