LGTM w/nits, no need to re-review.
http://gwt-code-reviews.appspot.com/1441803/diff/3010/dev/core/src/com/google/gwt/dev/javac/CachedCompilationUnit.java File dev/core/src/com/google/gwt/dev/javac/CachedCompilationUnit.java (right): http://gwt-code-reviews.appspot.com/1441803/diff/3010/dev/core/src/com/google/gwt/dev/javac/CachedCompilationUnit.java#newcode45 dev/core/src/com/google/gwt/dev/javac/CachedCompilationUnit.java:45: public CachedCompilationUnit(CachedCompilationUnit unit, long lastModified, Javadoc. http://gwt-code-reviews.appspot.com/1441803/diff/3010/dev/core/src/com/google/gwt/dev/javac/CachedCompilationUnit.java#newcode66 dev/core/src/com/google/gwt/dev/javac/CachedCompilationUnit.java:66: } You should just be able to just assign the field, the conversion would have happened already in the original unit. http://gwt-code-reviews.appspot.com/1441803/diff/3010/dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java File dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java (right): http://gwt-code-reviews.appspot.com/1441803/diff/3010/dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java#newcode3 dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java:3: * whitespace http://gwt-code-reviews.appspot.com/1441803/diff/3010/dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java#newcode404 dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java:404: unitCache.remove(cachedUnit); It looks like adding the new unit is supposed to bump out the old one. http://gwt-code-reviews.appspot.com/1441803/diff/3010/dev/core/src/com/google/gwt/dev/util/DiskCacheToken.java File dev/core/src/com/google/gwt/dev/util/DiskCacheToken.java (right): http://gwt-code-reviews.appspot.com/1441803/diff/3010/dev/core/src/com/google/gwt/dev/util/DiskCacheToken.java#newcode52 dev/core/src/com/google/gwt/dev/util/DiskCacheToken.java:52: } I think this can be reverted now http://gwt-code-reviews.appspot.com/1441803/ -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
