You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by du...@apache.org on 2014/09/16 15:50:28 UTC

git commit: updated refs/heads/bugfix/CID-1222206 to 93c7242

Repository: cloudstack
Updated Branches:
  refs/heads/bugfix/CID-1222206 [created] 93c724229


CID-1222206 Simplify isDmcEnabled.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/93c72422
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/93c72422
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/93c72422

Branch: refs/heads/bugfix/CID-1222206
Commit: 93c72422983947a624cf43ff72371434cc081ec4
Parents: ba93200
Author: imduffy15 <ia...@ianduffy.ie>
Authored: Tue Sep 16 14:49:52 2014 +0100
Committer: imduffy15 <ia...@ianduffy.ie>
Committed: Tue Sep 16 14:49:52 2014 +0100

----------------------------------------------------------------------
 .../xenserver/resource/XenServer56FP1Resource.java           | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93c72422/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java
index a119f48..a45abee 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java
@@ -119,11 +119,7 @@ public class XenServer56FP1Resource extends XenServer56Resource {
      */
     @Override
     protected boolean isDmcEnabled(Connection conn, Host host) throws XenAPIException, XmlRpcException {
-        Map<String, String> hostParams = new HashMap<String, String>();
-        hostParams = host.getLicenseParams(conn);
-
-        Boolean isDmcEnabled = hostParams.get("restrict_dmc").equalsIgnoreCase("false");
-
-        return isDmcEnabled;
+        Map<String, String> hostParams = host.getLicenseParams(conn);
+        return hostParams.get("restrict_dmc").equalsIgnoreCase("false");
     }
 }