Skip to content

Commit 99e8537

Browse files
committed
Make calculateRootModules return a Set instead of Stream
1 parent b14ee9d commit 99e8537

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ModuleLayerFeature.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,10 @@ public void afterAnalysis(AfterAnalysisAccess access) {
160160

161161
List<String> nonExplicit = List.of("ALL-DEFAULT", "ALL-SYSTEM", "ALL-MODULE-PATH");
162162

163-
Stream<Module> runtimeImageModules = calculateRootModulesAndUpdateExtraModules(accessImpl, nonExplicit, extraModules);
163+
Set<Module> runtimeImageModules = calculateRootModulesAndUpdateExtraModules(accessImpl, nonExplicit, extraModules);
164164

165165
Set<Module> runtimeImageNamedModules = runtimeImageModules
166+
.stream()
166167
.filter(Module::isNamed)
167168
.collect(Collectors.toSet());
168169

@@ -214,7 +215,7 @@ public void afterAnalysis(AfterAnalysisAccess access) {
214215
* Otherwise, we calculate root modules based on reachable modules and include modules as
215216
* specified in the JEP 261 (see <a href="https://openjdk.org/jeps/261"></a>).
216217
*/
217-
private static Stream<Module> calculateRootModulesAndUpdateExtraModules(FeatureImpl.AfterAnalysisAccessImpl accessImpl, Collection<String> nonExplicit, Collection<String> extraModules) {
218+
private static Set<Module> calculateRootModulesAndUpdateExtraModules(FeatureImpl.AfterAnalysisAccessImpl accessImpl, Collection<String> nonExplicit, Collection<String> extraModules) {
218219
AnalysisUniverse universe = accessImpl.getUniverse();
219220

220221
Stream<Module> rootModules;
@@ -266,7 +267,7 @@ private static Stream<Module> calculateRootModulesAndUpdateExtraModules(FeatureI
266267
}
267268
}
268269

269-
return rootModules.distinct();
270+
return rootModules.collect(Collectors.toSet());
270271
}
271272

272273
private static boolean typeIsReachable(AnalysisType t) {

0 commit comments

Comments
 (0)