better merge conflict resolution for TestCodecSupport.java

apache · Feb 3, 2025 · c246d7f · c246d7f
1 parent 96abdce
commit c246d7f
Showing 1 changed file with 1 addition and 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
@@ -242,7 +242,7 @@ public void testCompressionModeDefault() throws IOException {
         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();