Skip to content

Commit e4e6beb

Browse files
committed
Set the default of MaxTop to null
1 parent 1b6c9bf commit e4e6beb

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

src/Microsoft.AspNet.OData.Shared/Formatter/EdmLibHelpers.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,8 @@ private static ModelBoundQuerySettings GetMergedPropertyQuerySettings(
934934
propertyTypeQuerySettings.PageSize;
935935
}
936936

937-
if (mergedQuerySettings.MaxTop == 0 && propertyTypeQuerySettings.MaxTop != 0)
937+
if (!mergedQuerySettings.MaxTop.HasValue ||
938+
(mergedQuerySettings.MaxTop == 0 && propertyTypeQuerySettings.MaxTop != 0))
938939
{
939940
mergedQuerySettings.MaxTop =
940941
propertyTypeQuerySettings.MaxTop;

src/Microsoft.AspNet.OData.Shared/Query/DefaultQuerySettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace Microsoft.AspNet.OData.Query
1010
/// </summary>
1111
public class DefaultQuerySettings
1212
{
13-
private int? _maxTop = 0;
13+
private int? _maxTop;
1414

1515
/// <summary>
1616
/// Gets or sets a value indicating whether navigation property can be expanded.

src/Microsoft.AspNet.OData.Shared/Query/ModelBoundQuerySettings.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ public class ModelBoundQuerySettings
1818
private Dictionary<string, bool> _orderByConfigurations = new Dictionary<string, bool>();
1919
private Dictionary<string, bool> _filterConfigurations = new Dictionary<string, bool>();
2020

21-
internal static ModelBoundQuerySettings DefaultModelBoundQuerySettings = new ModelBoundQuerySettings
22-
{
23-
_maxTop = 0
24-
};
21+
internal static ModelBoundQuerySettings DefaultModelBoundQuerySettings = new ModelBoundQuerySettings();
2522

2623
/// <summary>
2724
/// Instantiates a new instance of the <see cref="ModelBoundQuerySettings"/> class

0 commit comments

Comments
 (0)