This commit is contained in:
Stef Heyenrath
2017-02-05 11:49:04 +01:00
parent 8e1ceeb6b2
commit 1adc7340d1

View File

@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using JetBrains.Annotations; using JetBrains.Annotations;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using SimMetrics.Net; using SimMetrics.Net;
using WireMock.Admin.Mappings; using WireMock.Admin.Mappings;
using WireMock.Admin.Requests; using WireMock.Admin.Requests;
@@ -390,7 +389,10 @@ namespace WireMock.Server
private MatcherModel[] Map([CanBeNull] IEnumerable<IMatcher> matchers) private MatcherModel[] Map([CanBeNull] IEnumerable<IMatcher> matchers)
{ {
return matchers?.Select(Map).Where(x => x != null).ToArray(); if (matchers == null || !matchers.Any())
return null;
return matchers.Select(Map).Where(x => x != null).ToArray();
} }
private MatcherModel Map([CanBeNull] IMatcher matcher) private MatcherModel Map([CanBeNull] IMatcher matcher)
@@ -407,7 +409,10 @@ namespace WireMock.Server
private string[] Map<T>([CanBeNull] IEnumerable<Func<T, bool>> funcs) private string[] Map<T>([CanBeNull] IEnumerable<Func<T, bool>> funcs)
{ {
return funcs?.Select(Map).Where(x => x != null).ToArray(); if (funcs == null || !funcs.Any())
return null;
return funcs.Select(Map).Where(x => x != null).ToArray();
} }
private string Map<T>([CanBeNull] Func<T, bool> func) private string Map<T>([CanBeNull] Func<T, bool> func)