Shireesh Anjal has uploaded a new change for review.
Change subject: gluster: Added null check at couple of places
......................................................................
gluster: Added null check at couple of places
Change-Id: If3c14530af6a1774274ebb537dcf14cda37c70e6
Signed-off-by: Shireesh Anjal <anjalshire...@gmail.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterServerService.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServicesReturnForXmlRpc.java
2 files changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/31/14731/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterServerService.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterServerService.java
index e86c86b..7c9b1f4 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterServerService.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterServerService.java
@@ -134,7 +134,7 @@
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + getId().hashCode();
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
result = prime * result + ((serverId == null) ? 0 :
serverId.hashCode());
result = prime * result + ((serviceId == null) ? 0 :
serviceId.hashCode());
result = prime * result + ((status == null) ? 0 : status.hashCode());
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServicesReturnForXmlRpc.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServicesReturnForXmlRpc.java
index 50771dc..600c2ff 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServicesReturnForXmlRpc.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServicesReturnForXmlRpc.java
@@ -5,6 +5,7 @@
import java.util.List;
import java.util.Map;
+import org.apache.commons.lang.StringUtils;
import
org.ovirt.engine.core.common.businessentities.gluster.GlusterServerService;
import org.ovirt.engine.core.common.businessentities.gluster.GlusterService;
import
org.ovirt.engine.core.common.businessentities.gluster.GlusterServiceStatus;
@@ -45,7 +46,8 @@
private GlusterServerService getService(Map<String, Object> serviceMap) {
GlusterServerService serverService = new GlusterServerService();
serverService.setServiceName((String) serviceMap.get(NAME));
- serverService.setPid(Integer.parseInt((String) serviceMap.get(PID)));
+ String pid = (String) serviceMap.get(PID);
+ serverService.setPid(StringUtils.isEmpty(pid) ? null :
Integer.parseInt(pid));
serverService.setStatus(GlusterServiceStatus.valueOf((String)
serviceMap.get(STATUS)));
serverService.setMessage((String) serviceMap.get(MESSAGE));
serverService.setServerId(serverId);
--
To view, visit http://gerrit.ovirt.org/14731
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If3c14530af6a1774274ebb537dcf14cda37c70e6
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shireesh Anjal <san...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
