Merge pull request #1695 from purenewman/patch-1

Mpdreamz · Mpdreamz · commit 35d9092c338b · 2015-12-31T13:50:30.000+01:00
Fixed potentially incorrect combining
diff --git a/src/Nest/QueryDsl/Abstractions/Query/BoolQueryExtensions.cs b/src/Nest/QueryDsl/Abstractions/Query/BoolQueryExtensions.cs
@@ -31,7 +31,7 @@ internal static QueryContainer CombineAsMust(this QueryContainer leftContainer,
 
 		internal static QueryContainer CombineAsShould(this QueryContainer leftContainer, QueryContainer rightContainer)
 		{
-			if (!leftContainer.CanMergeShould() || !leftContainer.CanMergeShould())
+			if (!leftContainer.CanMergeShould() || !rightContainer.CanMergeShould())
 				return CreateShouldContainer(new List<QueryContainer> { leftContainer, rightContainer });
 
 			var lBoolQuery = leftContainer.Self().Bool;
@@ -103,4 +103,4 @@ private static QueryContainer CreateMustContainer(IList<QueryContainer> mustClau
 				Filter = filters.ToListOrNullIfEmpty()
 			};
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ internal static QueryContainer CombineAsMust(this QueryContainer leftContainer,`
`31`	`31`
`32`	`32`	`internal static QueryContainer CombineAsShould(this QueryContainer leftContainer, QueryContainer rightContainer)`
`33`	`33`	`{`
`34`		`- if (!leftContainer.CanMergeShould() \|\| !leftContainer.CanMergeShould())`
	`34`	`+ if (!leftContainer.CanMergeShould() \|\| !rightContainer.CanMergeShould())`
`35`	`35`	`return CreateShouldContainer(new List<QueryContainer> { leftContainer, rightContainer });`
`36`	`36`
`37`	`37`	`var lBoolQuery = leftContainer.Self().Bool;`
`@@ -103,4 +103,4 @@ private static QueryContainer CreateMustContainer(IList<QueryContainer> mustClau`
`103`	`103`	`Filter = filters.ToListOrNullIfEmpty()`
`104`	`104`	`};`
`105`	`105`	`}`
`106`		`-}`
	`106`	`+}`