You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/05/13 07:01:35 UTC
stratos git commit: Adding null check for IaaS metadata
Repository: stratos
Updated Branches:
refs/heads/master 1e4649642 -> 2540ade8d
Adding null check for IaaS metadata
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2540ade8
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2540ade8
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2540ade8
Branch: refs/heads/master
Commit: 2540ade8ddff81db3913553b690d3bc216d1c6c0
Parents: 1e46496
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Wed May 13 10:31:12 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Wed May 13 10:31:21 2015 +0530
----------------------------------------------------------------------
.../stratos/cloud/controller/iaases/JcloudsIaas.java | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/2540ade8/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaas.java
index 1f7a261..942fe9e 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaas.java
@@ -158,11 +158,15 @@ public abstract class JcloudsIaas extends Iaas {
instanceMetadata.setHostname(nodeMetadata.getHostname());
instanceMetadata.setImageId(nodeMetadata.getImageId());
instanceMetadata.setLoginPort(nodeMetadata.getLoginPort());
- instanceMetadata.setHypervisor(nodeMetadata.getHardware().getHypervisor());
- instanceMetadata.setRam(nodeMetadata.getHardware().getRam());
- instanceMetadata.setOperatingSystemName(nodeMetadata.getOperatingSystem().getName());
- instanceMetadata.setOperatingSystemVersion(nodeMetadata.getOperatingSystem().getVersion());
- instanceMetadata.setOperatingSystem64bit(nodeMetadata.getOperatingSystem().is64Bit());
+ if (nodeMetadata.getHardware() != null) {
+ instanceMetadata.setHypervisor(nodeMetadata.getHardware().getHypervisor());
+ instanceMetadata.setRam(nodeMetadata.getHardware().getRam());
+ }
+ if (nodeMetadata.getOperatingSystem() != null) {
+ instanceMetadata.setOperatingSystemName(nodeMetadata.getOperatingSystem().getName());
+ instanceMetadata.setOperatingSystemVersion(nodeMetadata.getOperatingSystem().getVersion());
+ instanceMetadata.setOperatingSystem64bit(nodeMetadata.getOperatingSystem().is64Bit());
+ }
return instanceMetadata;
}