Updated Branches:
refs/heads/4.2 83c7b9ae5 -> dc1ac3c45
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/dc1ac3c4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dc1ac3c4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dc1ac3c4
Branch: refs/heads/4.2
Commit: dc1ac3c45dd2fe8d0579228c655177bda0d5e95c
Parents: 83c7b9a
Author: Vijayendra Bhamidipati <[email protected]>
Authored: Wed Jul 17 10:23:51 2013 -0700
Committer: Sheng Yang <[email protected]>
Committed: Wed Jul 17 16:58:26 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/dc1ac3c4/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";
