[Engine-patches] Change in ovirt-engine[master]: backend: sso method backend correction

[fkobzik]

Frank Kobzik has uploaded a new change for review.

Change subject: backend: sso method backend correction
......................................................................

backend: sso method backend correction

- sso method conversion from string is case insensitive now
- added VmBase.setSsoMethod(...) null check to prevent the entity to
  reach inconsistent state

Change-Id: Ic6e0a753748fb876a2f5c100ac1ec9ccf40aaceb
Signed-off-by: Frantisek Kobzik <fkob...@redhat.com>
---
M 
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/SsoMethod.java
M 
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
2 files changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/23142/1

diff --git 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/SsoMethod.java
 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/SsoMethod.java
index 1e520f8..808840a 100644
--- 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/SsoMethod.java
+++ 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/SsoMethod.java
@@ -12,7 +12,7 @@
 
     public static SsoMethod fromString(String val) {
         for (SsoMethod ssoMethod : SsoMethod.values()) {
-            if (ssoMethod.value.equals(val)) {
+            if (ssoMethod.value.equalsIgnoreCase(val)) {
                 return ssoMethod;
             }
         }
diff --git 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
index c0cf842..f951658 100644
--- 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
+++ 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
@@ -829,6 +829,9 @@
     }
 
     public void setSsoMethod(SsoMethod ssoMethod) {
+        if (ssoMethod == null) {
+            return;
+        }
         this.ssoMethod = ssoMethod;
     }
 }


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

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