Change logic around dev-mode redirect hook early exit to fix broken WebWorker linkers.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@10769 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java b/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java
index db74092..5d57866 100644
--- a/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java
+++ b/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java
@@ -528,9 +528,10 @@
if (shouldIncludeBootstrapInPrimaryFragment(context)) {
out.append(generateSelectionScript(logger, context, artifacts, result));
+ // only needed in SSSS, breaks WebWorker linker if done all the time
+ out.append("if (" + context.getModuleFunctionName() + ".succeeded) {\n");
}
- out.append("if (" + context.getModuleFunctionName() + ".succeeded) {\n");
if (shouldInstallCode(context)) {
// Rewrite the code so it can be installed with
@@ -548,9 +549,9 @@
out.append(script);
out.append("\n");
}
-
- out.append("}\n");
-
+ if (shouldIncludeBootstrapInPrimaryFragment(context)) {
+ out.append("}\n");
+ }
return out.toString();
}
}
