Fixed bad mojo with permutation IDs between CompilePerms and Link.
Review by: bobv (TBR)
git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@4295 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/dev/CompilePerms.java b/dev/core/src/com/google/gwt/dev/CompilePerms.java
index 810a9b9..b2e7072 100644
--- a/dev/core/src/com/google/gwt/dev/CompilePerms.java
+++ b/dev/core/src/com/google/gwt/dev/CompilePerms.java
@@ -292,7 +292,7 @@
}
}
- File[] resultFiles = makeResultFiles(compilerWorkDir, perms);
+ File[] resultFiles = makeResultFiles(compilerWorkDir, subPerms);
compile(logger, precompilation, subPerms, options.getLocalWorkers(),
resultFiles);
}
diff --git a/dev/core/src/com/google/gwt/dev/Link.java b/dev/core/src/com/google/gwt/dev/Link.java
index b16262f..a255423 100644
--- a/dev/core/src/com/google/gwt/dev/Link.java
+++ b/dev/core/src/com/google/gwt/dev/Link.java
@@ -258,7 +258,8 @@
Permutation[] perms = precompilation.getPermutations();
File[] resultFiles = new File[perms.length];
for (int i = 0; i < perms.length; ++i) {
- resultFiles[i] = CompilePerms.makePermFilename(compilerWorkDir, i);
+ resultFiles[i] = CompilePerms.makePermFilename(compilerWorkDir,
+ perms[i].getId());
if (!resultFiles[i].exists()) {
logger.log(TreeLogger.ERROR, "File not found '"
+ precompilationFile.getAbsolutePath()
