Shireesh Anjal has uploaded a new change for review.

Change subject: gluster: fixed NPE in GlusterAuditLogUtil
......................................................................

gluster: fixed NPE in GlusterAuditLogUtil

Modified methods logVolumeMessage() and logServerMessage()
to pass empty map for customValues to logAuditMessage()
instead of null, as it was causing an NPE in
AuditLogDirector#getAvailableValues()

Change-Id: Id3b563573670c379e085b641174cd7b1f0de2864
Signed-off-by: Shireesh Anjal <[email protected]>
---
M 
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/gluster/GlusterAuditLogUtil.java
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/95/11595/1

diff --git 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/gluster/GlusterAuditLogUtil.java
 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/gluster/GlusterAuditLogUtil.java
index 9324854..9d33dc2 100644
--- 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/gluster/GlusterAuditLogUtil.java
+++ 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/gluster/GlusterAuditLogUtil.java
@@ -1,5 +1,6 @@
 package org.ovirt.engine.core.dal.dbbroker.auditloghandling.gluster;
 
+import java.util.HashMap;
 import java.util.Map;
 
 import org.ovirt.engine.core.common.AuditLogType;
@@ -26,11 +27,11 @@
     }
 
     public void logVolumeMessage(final GlusterVolumeEntity volume, final 
AuditLogType logType) {
-        logAuditMessage(volume.getClusterId(), volume, null, logType, null);
+        logAuditMessage(volume.getClusterId(), volume, null, logType, new 
HashMap<String, String>());
     }
 
     public void logServerMessage(final VDS server, final AuditLogType logType) 
{
-        logAuditMessage(null, null, server, logType, null);
+        logAuditMessage(null, null, server, logType, new HashMap<String, 
String>());
     }
 
     @SuppressWarnings("serial")


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3b563573670c379e085b641174cd7b1f0de2864
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shireesh Anjal <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to