Merge 3.0.x into Freeze

eclipse-4diac · Sep 20, 2024 · d1e68d5 · d1e68d5
2 parents db8f26c + 86b3490
commit d1e68d5
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/...s/org.eclipse.fordiac.ide.library/src/org/eclipse/fordiac/ide/library/LibraryManager.java b/...s/org.eclipse.fordiac.ide.library/src/org/eclipse/fordiac/ide/library/LibraryManager.java
@@ -953,8 +953,9 @@ private static LibraryRecord getLibraryRecord(final Map<String, List<LibraryReco
 	 */
 	private static LibraryRecord getLibraryRecord(final Map<String, List<LibraryRecord>> libs,
 			final String symbolicName, final VersionRange range) {
-		return libs.get(symbolicName).stream().filter(l -> range.includes(l.version()))
-				.sorted((o1, o2) -> o2.version().compareTo(o1.version())).findFirst().orElse(null);
+		return libs.getOrDefault(symbolicName, Collections.emptyList()).stream()
+				.filter(l -> range.includes(l.version())).sorted((o1, o2) -> o2.version().compareTo(o1.version()))
+				.findFirst().orElse(null);
 	}
 
 	/**
@@ -967,7 +968,7 @@ private static LibraryRecord getLibraryRecord(final Map<String, List<LibraryReco
 	 */
 	private static LibraryRecord getLibraryRecord(final Map<String, List<LibraryRecord>> libs,
 			final String symbolicName, final java.net.URI uri) {
-		return libs.get(symbolicName).stream().filter(l -> l.uri().equals(uri))
+		return libs.getOrDefault(symbolicName, Collections.emptyList()).stream().filter(l -> l.uri().equals(uri))
 				.sorted((o1, o2) -> o2.version().compareTo(o1.version())).findFirst().orElse(null);
 	}