[Engine-patches] Change in ovirt-engine[master]: engine: Added null check to avoid NPE

[dgopal]

Dhandapani Gopal has uploaded a new change for review.

Change subject: engine: Added null check to avoid NPE
......................................................................

engine: Added null check to avoid NPE

  If the qualified brick name is not available in the brick list,
  may through null pointer exception. To avoid this null check is added.

Change-Id: I3ad34678038312072579a35b65d0879b523e15df
Signed-off-by: Dhandapani <dgo...@redhat.com>
---
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GlusterVolumeStatusReturnForXmlRpc.java
1 file changed, 8 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/17/9117/1

diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GlusterVolumeStatusReturnForXmlRpc.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GlusterVolumeStatusReturnForXmlRpc.java
index 8d84faf..3be07a7 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GlusterVolumeStatusReturnForXmlRpc.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GlusterVolumeStatusReturnForXmlRpc.java
@@ -6,6 +6,7 @@
 
 import org.ovirt.engine.core.common.businessentities.gluster.BrickDetails;
 import org.ovirt.engine.core.common.businessentities.gluster.BrickProperties;
+import 
org.ovirt.engine.core.common.businessentities.gluster.GlusterBrickEntity;
 import org.ovirt.engine.core.common.businessentities.gluster.GlusterClientInfo;
 import org.ovirt.engine.core.common.businessentities.gluster.GlusterStatus;
 import 
org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeAdvancedDetails;
@@ -160,8 +161,13 @@
 
     private BrickProperties getBrickProperties(GlusterVolumeEntity volume, 
Map<String, Object> brick) {
         BrickProperties brickProperties = new BrickProperties();
-        
brickProperties.setBrickId(GlusterCoreUtil.getBrickByQualifiedName(volume.getBricks(),
-                (String) brick.get(BRICK)).getId());
+
+        GlusterBrickEntity brickEntity =
+                GlusterCoreUtil.getBrickByQualifiedName(volume.getBricks(), 
(String) brick.get(BRICK));
+        if (brickEntity != null) {
+            brickProperties.setBrickId(brickEntity.getId());
+        }
+
         if (brick.containsKey(PORT)) {
             brickProperties.setPort(Integer.valueOf((String) brick.get(PORT)));
         }


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

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