From 4a3b4d21c3f980221591243c3f9fc8c53e89f6ec Mon Sep 17 00:00:00 2001 From: Abhinandan Prateek Date: Tue, 11 Oct 2011 16:46:15 +0530 Subject: [PATCH] bug 11675: optimized the code --- .../cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java index 71e8390141f..01265871b6b 100755 --- a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java +++ b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java @@ -387,12 +387,9 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L String prodBrand = record.softwareVersion.get("product_brand").trim(); String prodVersion = record.softwareVersion.get("product_version").trim(); - if(prodBrand.equals("XCP") && prodVersion.equals("1.0.0")) + if(prodBrand.equals("XCP") && (prodVersion.equals("1.0.0") || prodVersion.equals("1.1.0"))) return new XcpServerResource(); - if(prodBrand.equals("XCP") && prodVersion.equals("1.1.0")) - return new XcpServerResource(); - if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.0")) return new XenServer56Resource();