Don't use a static QueryShardResult for a null instance (#52063)

romseygeek · web-flow · commit 6ae68cd6209a · 2020-02-07T11:01:21.000-08:00
Fixes #52042
diff --git a/server/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java b/server/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java
@@ -92,13 +92,11 @@ private QuerySearchResult(boolean isNull) {
         this.isNull = isNull;
     }
 
-    private static final QuerySearchResult nullInstance = new QuerySearchResult(true);
-
     /**
      * Returns an instance that contains no response.
      */
     public static QuerySearchResult nullInstance() {
-        return nullInstance;
+        return new QuerySearchResult(true);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -92,13 +92,11 @@ private QuerySearchResult(boolean isNull) {`
`92`	`92`	`this.isNull = isNull;`
`93`	`93`	`}`
`94`	`94`
`95`		`- private static final QuerySearchResult nullInstance = new QuerySearchResult(true);`
`96`		`-`
`97`	`95`	`/**`
`98`	`96`	`* Returns an instance that contains no response.`
`99`	`97`	`*/`
`100`	`98`	`public static QuerySearchResult nullInstance() {`
`101`		`- return nullInstance;`
	`99`	`+ return new QuerySearchResult(true);`
`102`	`100`	`}`
`103`	`101`
`104`	`102`	`/**`