--- old/src/java.base/share/classes/java/lang/module/ModulePath.java	2016-04-25 14:50:29.000000000 -0700
+++ new/src/java.base/share/classes/java/lang/module/ModulePath.java	2016-04-25 14:50:29.000000000 -0700
@@ -438,8 +438,7 @@
         // map names of service configuration files to service names
         Set<String> serviceNames = configFiles.stream()
             .map(this::toServiceName)
-            .filter(Optional::isPresent)
-            .map(Optional::get)
+            .flatMap(Optional::stream)
             .collect(Collectors.toSet());
 
         // parse each service configuration file