Resolves smartstore#1322 Price facets can end in infinite loop

mgesing · mgesing · commit cb1a95f0ea46 · 2017-12-13T17:18:22.000+01:00
diff --git a/src/Libraries/SmartStore.Services/Search/Extensions/FacetUtility.cs b/src/Libraries/SmartStore.Services/Search/Extensions/FacetUtility.cs
@@ -8,6 +8,8 @@ namespace SmartStore.Services.Search.Extensions
 {
 	public static class FacetUtility
 	{
+		private const double MAX_PRICE = 1000000000;
+
 		private static int[,] _priceThresholds = new int[,]
 		{
 			{ 10, 5 },
@@ -39,23 +41,23 @@ public static double GetNextPrice(double price)
 					return price + _priceThresholds[i, 1];
 			}
 
-			return 1000000000;
+			return MAX_PRICE;
 		}
 
 		public static double MakePriceEven(double price)
 		{
 			if (price == 0.0)
 				return GetNextPrice(0.0);
 
-			// get previous threshold for price
+			// Get previous threshold for price.
 			var result = 0.0;
 			for (var i = 1; i <= _priceThresholds.GetUpperBound(0) && result == 0.0; ++i)
 			{
 				if (price < _priceThresholds[i, 0])
 					result = _priceThresholds[i - 1, 0];
 			}
 
-			while (result < price)
+			while (result < price && result < MAX_PRICE)
 			{
 				result = GetNextPrice(result);
 			}

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@ namespace SmartStore.Services.Search.Extensions`
`8`	`8`	`{`
`9`	`9`	`public static class FacetUtility`
`10`	`10`	`{`
	`11`	`+ private const double MAX_PRICE = 1000000000;`
	`12`	`+`
`11`	`13`	`private static int[,] _priceThresholds = new int[,]`
`12`	`14`	`{`
`13`	`15`	`{ 10, 5 },`
`@@ -39,23 +41,23 @@ public static double GetNextPrice(double price)`
`39`	`41`	`return price + _priceThresholds[i, 1];`
`40`	`42`	`}`
`41`	`43`
`42`		`- return 1000000000;`
	`44`	`+ return MAX_PRICE;`
`43`	`45`	`}`
`44`	`46`
`45`	`47`	`public static double MakePriceEven(double price)`
`46`	`48`	`{`
`47`	`49`	`if (price == 0.0)`
`48`	`50`	`return GetNextPrice(0.0);`
`49`	`51`
`50`		`- // get previous threshold for price`
	`52`	`+ // Get previous threshold for price.`
`51`	`53`	`var result = 0.0;`
`52`	`54`	`for (var i = 1; i <= _priceThresholds.GetUpperBound(0) && result == 0.0; ++i)`
`53`	`55`	`{`
`54`	`56`	`if (price < _priceThresholds[i, 0])`
`55`	`57`	`result = _priceThresholds[i - 1, 0];`
`56`	`58`	`}`
`57`	`59`
`58`		`- while (result < price)`
	`60`	`+ while (result < price && result < MAX_PRICE)`
`59`	`61`	`{`
`60`	`62`	`result = GetNextPrice(result);`
`61`	`63`	`}`