Ori Liel has uploaded a new change for review.

Change subject: resatpi: Partial Cluster Version Causes NPE
......................................................................

resatpi: Partial Cluster Version Causes NPE

When creating a new cluster, providing only major or minor fields of the version
(not both) will cause crash

Change-Id: Iabc59e204a9f5bd37d6e2b41e5377aeb10d6e184
Bug-Url: https://bugzilla.redhat.com/988067
Signed-off-by: Ori Liel <ol...@redhat.com>
---
M 
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/17480/1

diff --git 
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java
 
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java
index 1c46fb5..70ccf55 100644
--- 
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java
+++ 
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java
@@ -54,7 +54,8 @@
         }
         if (model.isSetMemoryPolicy()) {
             entity = map(model.getMemoryPolicy(), entity);
-        } else if (model.isSetVersion() && greaterOrEqual(model.getVersion() , 
min_thp_version)){
+        } else if (model.isSetVersion() && model.getVersion().getMajor() != 
null
+                && model.getVersion().getMinor() != null && 
greaterOrEqual(model.getVersion(), min_thp_version)) {
             entity.setTransparentHugepages(true);
         }
         if (model.isSetSchedulingPolicy()) {


-- 
To view, visit http://gerrit.ovirt.org/17480
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iabc59e204a9f5bd37d6e2b41e5377aeb10d6e184
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Ori Liel <ol...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to