From 281f3a547debed468c8240cd283ff70ff5f97d36 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Wed, 18 Jul 2018 09:04:50 +0300 Subject: [PATCH] Audit logging module nullcheck during filtering --- .../EntityFrameworkCore/EfCoreAuditLogRepository.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/EfCoreAuditLogRepository.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/EfCoreAuditLogRepository.cs index 1fddbb5870..c778503ac8 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/EfCoreAuditLogRepository.cs +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/EfCoreAuditLogRepository.cs @@ -29,8 +29,8 @@ namespace Volo.Abp.AuditLogging.EntityFrameworkCore { var query = DbSet.AsNoTracking() .IncludeDetails(includeDetails) - .WhereIf(httpMethod != null, q => q.HttpMethod.ToLowerInvariant() == httpMethod.ToLowerInvariant()) - .WhereIf(url != null, q => q.Url.ToLowerInvariant().Contains(url.ToLowerInvariant())) + .WhereIf(httpMethod != null, q => q.HttpMethod != null && q.HttpMethod.ToLowerInvariant() == httpMethod.ToLowerInvariant()) + .WhereIf(url != null, q => q.Url != null && q.Url.ToLowerInvariant().Contains(url.ToLowerInvariant())) .WhereIf(httpStatusCode != null && httpStatusCode > 0, q => q.HttpStatusCode == (int?)httpStatusCode); var totalCount = await query.LongCountAsync();