Martin Mucha has uploaded a new change for review. Change subject: core: don't check for null serverity, forbid it. ......................................................................
core: don't check for null serverity, forbid it. we can controll that null severity of AuditLogType will not exist, which is better than checking if it's null. Change-Id: Ic44fb1683bacfa1c0f992ad4f272c3bb56526836 Signed-off-by: Martin Mucha <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java 2 files changed, 3 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/41/30041/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java index 4ef53e5..5741e2c 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java @@ -1050,7 +1050,9 @@ } private AuditLogType(int value, AuditLogSeverity severity) { - this(value, severity, 0); + this(value, + severity == null ? AuditLogSeverity.NORMAL : severity, + 0); } private AuditLogType(int value, int eventFloodRate) { diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java index a4b2743..854531c 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java @@ -76,11 +76,6 @@ private void saveToDb(AuditLogableBase auditLogable, AuditLogType logType, String loggerString) { AuditLogSeverity severity = logType.getSeverity(); - - if (severity == null) { - severity = AuditLogSeverity.NORMAL; - log.infoFormat("No severity for {0} audit log type, assuming Normal severity", logType); - } AuditLog auditLog = createAuditLog(auditLogable, logType, loggerString, severity); if (auditLog == null) { -- To view, visit http://gerrit.ovirt.org/30041 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic44fb1683bacfa1c0f992ad4f272c3bb56526836 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
