--- old/src/java.base/share/classes/jdk/internal/module/ModulePathValidator.java	2018-09-10 14:12:23.383490752 -0400
+++ new/src/java.base/share/classes/jdk/internal/module/ModulePathValidator.java	2018-09-10 14:12:22.903490752 -0400
@@ -25,7 +25,6 @@
 
 package jdk.internal.module;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.lang.module.FindException;
@@ -37,12 +36,12 @@
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
-import java.util.stream.Stream;
 
 /**
  * A validator to check for errors and conflicts between modules.
@@ -78,7 +77,8 @@
         // upgrade module path
         String value = System.getProperty("jdk.module.upgrade.path");
         if (value != null) {
-            Stream.of(value.split(File.pathSeparator))
+            Paths.pathToStrings(value)
+                    .stream()
                     .map(Path::of)
                     .forEach(validator::scan);
         }
@@ -91,7 +91,8 @@
         // application module path
         value = System.getProperty("jdk.module.path");
         if (value != null) {
-            Stream.of(value.split(File.pathSeparator))
+            Paths.pathToStrings(value)
+                    .stream()
                     .map(Path::of)
                     .forEach(validator::scan);
         }