--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ModuleFinder.java	Wed Mar 15 06:30:33 2017 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ModuleFinder.java	Wed Mar 15 15:46:43 2017 +0100
@@ -355,7 +355,7 @@
 
             if (fo == null) {
                 fo = getModuleInfoFromLocation(msym.classLocation, Kind.CLASS);
-                fo = preferredFileObject(fo, getModuleInfoFromLocation(msym.sourceLocation, Kind.SOURCE));
+                fo = preferredFileObject(getModuleInfoFromLocation(msym.sourceLocation, Kind.SOURCE), fo);
             }
 
             if (fo == null) {