From b04155272e7d48311109f53c81b1693b20b4391b Mon Sep 17 00:00:00 2001 From: Martin Weber Date: Mon, 28 Mar 2022 21:13:41 +0200 Subject: [PATCH] Bug 579457 - IllegalStateException in o.e.cdt.jsoncdb.core.CompileCommandsJsonParser Signed-off-by: Martin Weber Change-Id: I7ac3f02cca706aa0308662a8be3e783dfca4fa3c --- .../org/eclipse/cdt/jsoncdb/core/CompileCommandsJsonParser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/CompileCommandsJsonParser.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/CompileCommandsJsonParser.java index 9be7d1f79d4..898dd62b6d5 100644 --- a/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/CompileCommandsJsonParser.java +++ b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/CompileCommandsJsonParser.java @@ -346,7 +346,7 @@ public class CompileCommandsJsonParser { Map effectiveDefines = Stream .concat(builtinDefines.entrySet().stream(), fileResult.getDefines().entrySet().stream()) .collect(Collectors.toMap(stringPooler.compose(Map.Entry::getKey), - stringPooler.compose(Map.Entry::getValue))); + stringPooler.compose(Map.Entry::getValue), (e1, e2) -> e1)); List includePaths = Stream .concat(fileResult.getIncludePaths().stream(), builtinDetectorsResult.getIncludePaths().stream()) .map(stringPooler).collect(Collectors.toList());