(solr) branch ishan/upgrade-to-lucene-10 updated: better merge conflict resolution for TestCodecSupport.java

[cpoerschke]

This is an automated email from the ASF dual-hosted git repository.

cpoerschke pushed a commit to branch ishan/upgrade-to-lucene-10
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/ishan/upgrade-to-lucene-10 by 
this push:
     new c246d7f8750 better merge conflict resolution for TestCodecSupport.java
c246d7f8750 is described below

commit c246d7f8750336cc7335b363a53aed8335ec2d5e
Author: Christine Poerschke <cpoersc...@apache.org>
AuthorDate: Mon Feb 3 15:41:58 2025 +0000

    better merge conflict resolution for TestCodecSupport.java
---
 solr/core/src/test/org/apache/solr/core/TestCodecSupport.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java 
b/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java
index 780bd3c676e..fb0d1b8de2e 100644
--- a/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java
+++ b/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java
@@ -242,7 +242,7 @@ public class TestCodecSupport extends SolrTestCaseJ4 {
         config.get("codecFactory").attr("class"));
     assertTrue(
         "Unexpected configuration of codec factory for this test. Expecting 
empty element",
-        config.get("codecFactory").getAll(null, Set.of()).isEmpty());
+        config.get("codecFactory").getAll(null, null).isEmpty());
     IndexSchema schema = 
IndexSchemaFactory.buildIndexSchema("schema_codec.xml", config);
 
     CoreContainer coreContainer = h.getCoreContainer();