[Engine-patches] Change in ovirt-engine[ovirt-engine-3.5]: aaa: more coverity fixes

[Alon Bar-Lev]

Alon Bar-Lev has uploaded a new change for review.

Change subject: aaa: more coverity fixes
......................................................................

aaa: more coverity fixes

Topic: AAA
Change-Id: Ie25bc66509d1e0986e7b92edc07537c869bd490c
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M 
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResource.java
M 
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GroupMapper.java
M 
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java
3 files changed, 10 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/77/31877/1

diff --git 
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResource.java
 
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResource.java
index e821bf7..1c33091 100644
--- 
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResource.java
+++ 
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResource.java
@@ -2,6 +2,7 @@
 
 import static org.ovirt.engine.api.utils.ReflectionHelper.assignChildModel;
 
+import java.nio.charset.Charset;
 import java.text.MessageFormat;
 import java.util.List;
 
@@ -84,7 +85,7 @@
                VdcQueryType.GetDomainList,
                new VdcQueryParametersBase());
             for (String domain :domains) {
-                Guid domainId = asGuid(domain.getBytes(), true);
+                Guid domainId = 
asGuid(domain.getBytes(Charset.forName("UTF-8")), true);
                 if (domainId.toString().equals(user.getDomain().getId())) {
                    return domain;
                 }
diff --git 
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GroupMapper.java
 
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GroupMapper.java
index 4d07362..a376a73 100644
--- 
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GroupMapper.java
+++ 
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GroupMapper.java
@@ -1,5 +1,7 @@
 package org.ovirt.engine.api.restapi.types;
 
+import java.nio.charset.Charset;
+
 import org.apache.commons.lang.StringUtils;
 import org.ovirt.engine.api.model.Domain;
 import org.ovirt.engine.api.model.Group;
@@ -18,7 +20,7 @@
         model.setId(entity.getId().toString());
         if (!StringUtils.isEmpty(entity.getDomain())) {
             Domain dom = new Domain();
-            dom.setId(new Guid(entity.getDomain().getBytes(), 
true).toString());
+            dom.setId(new 
Guid(entity.getDomain().getBytes(Charset.forName("UTF-8")), true).toString());
             model.setDomain(dom);
         }
         
model.setDomainEntryId(DirectoryEntryIdUtils.encode(entity.getExternalId()));
@@ -32,7 +34,7 @@
         model.setName(entity.getName());
         if (!StringUtils.isEmpty(entity.getDirectoryName())) {
             Domain dom = new Domain();
-            dom.setId(new Guid(entity.getDirectoryName().getBytes(), 
true).toString());
+            dom.setId(new 
Guid(entity.getDirectoryName().getBytes(Charset.forName("UTF-8")), 
true).toString());
             model.setDomain(dom);
         }
         model.setId(DirectoryEntryIdUtils.encode(entity.getId()));
diff --git 
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java
 
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java
index de6b049..76d7a15 100644
--- 
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java
+++ 
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java
@@ -1,5 +1,7 @@
 package org.ovirt.engine.api.restapi.types;
 
+import java.nio.charset.Charset;
+
 import org.apache.commons.lang.StringUtils;
 import org.ovirt.engine.api.model.Domain;
 import org.ovirt.engine.api.model.Group;
@@ -35,7 +37,7 @@
         }
         if (!StringUtils.isEmpty(entity.getDomain())) {
             Domain dom = new Domain();
-            dom.setId(new Guid(entity.getDomain().getBytes(), 
true).toString());
+            dom.setId(new 
Guid(entity.getDomain().getBytes(Charset.forName("UTF-8")), true).toString());
             model.setDomain(dom);
         }
         return model;
@@ -61,7 +63,7 @@
         }
         if (!StringUtils.isEmpty(entity.getDirectoryName())) {
             Domain dom = new Domain();
-            dom.setId(new Guid(entity.getDirectoryName().getBytes(), 
true).toString());
+            dom.setId(new 
Guid(entity.getDirectoryName().getBytes(Charset.forName("UTF-8")), 
true).toString());
             model.setDomain(dom);
         }
         return model;


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie25bc66509d1e0986e7b92edc07537c869bd490c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches