Updated Branches: refs/heads/2554 1cf87aece -> 0c74d9bfd
If no version info is found default to 1.0 Default to the normative XCP type if no version information is found. Signed-off-by: Prasanna Santhanam <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0c74d9bf Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0c74d9bf Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0c74d9bf Branch: refs/heads/2554 Commit: 0c74d9bfd1d6729a0b644f0537214c614d43624c Parents: 1cf87ae Author: Prasanna Santhanam <[email protected]> Authored: Sat May 18 18:42:18 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Sat May 18 18:42:18 2013 +0530 ---------------------------------------------------------------------- .../hypervisor/xen/resource/XcpServerResource.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c74d9bf/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpServerResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpServerResource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpServerResource.java index 00aa8bb..954773c 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpServerResource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpServerResource.java @@ -36,8 +36,8 @@ import java.util.List; @Local(value=ServerResource.class) public class XcpServerResource extends CitrixResourceBase { - private final static Logger s_logger = Logger.getLogger(XcpServerResource.class); - private String version; + private final static Logger s_logger = Logger.getLogger(XcpServerResource.class); + private String version; public XcpServerResource() { super(); @@ -67,7 +67,7 @@ public class XcpServerResource extends CitrixResourceBase { @Override protected String getGuestOsType(String stdType, boolean bootFromCD) { - if (getVersion().startsWith("1.6")) { + if (getVersion() != null && getVersion().startsWith("1.6")) { return CitrixHelper.getXcp160GuestOsType(stdType); } else { return CitrixHelper.getXcpGuestOsType(stdType);
