Preserve query string in generated long response urls if present (mai…

…nly for GWT)
wocommunity · Dec 11, 2012 · 91318cc · 91318cc
1 parent d578b2c
commit 91318cc
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/concurrency/ERXLongResponse.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/concurrency/ERXLongResponse.java
@@ -92,8 +92,12 @@ public void appendToResponse(WOResponse aResponse, WOContext aContext)  {
             // If the response is done and finished quickly (before the first branch of this conditional is invoked),
             // make sure to refresh the page immediately.
             String modifiedDynamicUrl = aContext.urlWithRequestHandlerKey(WOApplication.application().componentRequestHandlerKey(), null, null);
-
-            String header = interval + ";url=" +modifiedDynamicUrl+ "/" + aContext.session().sessionID()+ "/" +aContext.contextID()+ "." +WOMetaRefreshSenderId;
+            String query = "";
+            if (modifiedDynamicUrl.contains("?")) {
+            	query = modifiedDynamicUrl.substring(modifiedDynamicUrl.indexOf("?"));
+            	modifiedDynamicUrl = modifiedDynamicUrl.substring(0, modifiedDynamicUrl.indexOf("?"));
+            }
+            String header = interval + ";url=" +modifiedDynamicUrl+ "/" + aContext.session().sessionID()+ "/" +aContext.contextID()+ "." +WOMetaRefreshSenderId + query;
 
             aResponse.setHeader(header, "Refresh");
             if((doneButNotRefreshed)) {