Reviewers: jbrosenberg, tobyr,

Description:
Last change prevented re-loading modules, but caused it to write too
many
modules out in an archive.


Please review this at http://gwt-code-reviews.appspot.com/1464803/

Affected files:
  M dev/core/src/com/google/gwt/dev/CompileModule.java


Index: dev/core/src/com/google/gwt/dev/CompileModule.java
===================================================================
--- dev/core/src/com/google/gwt/dev/CompileModule.java  (revision 10355)
+++ dev/core/src/com/google/gwt/dev/CompileModule.java  (working copy)
@@ -187,6 +187,7 @@
public boolean run(final TreeLogger logger) throws UnableToCompleteException {

     Set<String> alreadyLoadedArchives = new HashSet<String>();
+    Set<String> archivedResourcePaths = new HashSet<String>();

     // TODO(zundel): There is an optimal order to compile these modules in.
// Modify ModuleDefLoader to be able to figure that out and sort them for
@@ -201,7 +202,6 @@
         return false;
       }

-      Set<String> archivedResourcePaths = new HashSet<String>();
       SpeedTracerLogger.Event loadAllArchives =
SpeedTracerLogger.start(CompilerEventType.LOAD_ARCHIVE, "module", moduleToCompile);
       try {
@@ -262,6 +262,7 @@
       for (CompilationUnit unit : compilationState.getCompilationUnits()) {
         if (!archivedResourcePaths.contains(unit.getResourcePath())) {
           outputModule.addUnit(unit);
+          archivedResourcePaths.add(unit.getResourcePath());
         }
       }



--
http://groups.google.com/group/Google-Web-Toolkit-Contributors

Reply via email to