Fix recent breakage in r4520 where super-source was not given priority over
other path entries, and adds a test to detect failure.
Patch by: jat, scottb
Review by: scottb, jat
git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@4527 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/dev/resource/impl/PathPrefixSet.java b/dev/core/src/com/google/gwt/dev/resource/impl/PathPrefixSet.java
index 92572a6..d0bf0d2 100644
--- a/dev/core/src/com/google/gwt/dev/resource/impl/PathPrefixSet.java
+++ b/dev/core/src/com/google/gwt/dev/resource/impl/PathPrefixSet.java
@@ -264,10 +264,14 @@
/**
* Returns true if the first pathPrefix is inserted into the PathPrefixSet
- * after the second pathPrefix.
+ * after the second pathPrefix. Also, rereooting PathPrefixes take priority
+ * over non-rerooting ones (ie, super-source).
*/
public boolean secondPrefixOverridesFirst(PathPrefix prefix1,
PathPrefix prefix2) {
+ if (prefix1.shouldReroot() != prefix2.shouldReroot()) {
+ return prefix2.shouldReroot();
+ }
int rank1 = prefixes.get(prefix1);
assert rank1 > 0;
int rank2 = prefixes.get(prefix2);
diff --git a/dev/core/test/com/google/gwt/dev/resource/impl/ResourceOracleImplTest.java b/dev/core/test/com/google/gwt/dev/resource/impl/ResourceOracleImplTest.java
index 0903a4f..4144e28 100644
--- a/dev/core/test/com/google/gwt/dev/resource/impl/ResourceOracleImplTest.java
+++ b/dev/core/test/com/google/gwt/dev/resource/impl/ResourceOracleImplTest.java
@@ -303,6 +303,35 @@
new ClassPathEntry[] {cpe1, cpe2}, pp1, pp2);
}
+ /*
+ * Ensure refresh is stable when multiple classpaths + multiple path prefixes
+ * all include the same resource.
+ */
+ public void testSuperSourceSupercedesSource() {
+ TreeLogger logger = createTestTreeLogger();
+
+ MockClassPathEntry cpe1 = new MockClassPathEntry("/cpe1/");
+ cpe1.addResource("java/lang/Object.java");
+
+ MockClassPathEntry cpe2 = new MockClassPathEntry("/cpe2/");
+ cpe2.addResource("translatable/java/lang/Object.java");
+
+ PathPrefix pp1 = new PathPrefix("java/lang/", null, false);
+ PathPrefix pp2 = new PathPrefix("translatable/", null, true);
+
+ // Ensure the translatable overrides the basic despite swapping CPE order.
+ testResourceInCPE(logger, "java/lang/Object.java", cpe2,
+ new ClassPathEntry[] {cpe1, cpe2}, pp1, pp2);
+ testResourceInCPE(logger, "java/lang/Object.java", cpe2,
+ new ClassPathEntry[] {cpe2, cpe1}, pp1, pp2);
+
+ // Ensure the translatable overrides the basic despite swapping PPS order.
+ testResourceInCPE(logger, "java/lang/Object.java", cpe2,
+ new ClassPathEntry[] {cpe1, cpe2}, pp2, pp1);
+ testResourceInCPE(logger, "java/lang/Object.java", cpe2,
+ new ClassPathEntry[] {cpe2, cpe1}, pp2, pp1);
+ }
+
/**
* Creates an array of class path entries, setting up each one with a
* well-known set of client prefixes.
