CRQ-8774 replace amp symbol with encoded entity

Alexey Zarakovskiy · Alexey Zarakovskiy · commit cba42a1f27e5 · 2018-02-21T09:45:50.000+01:00
diff --git a/dxa-framework/dxa-tridion-provider/src/main/java/com/sdl/webapp/tridion/mapping/AbstractDefaultContentProvider.java b/dxa-framework/dxa-tridion-provider/src/main/java/com/sdl/webapp/tridion/mapping/AbstractDefaultContentProvider.java
@@ -347,7 +347,7 @@ protected String prependFullUrlIfNeeded(String path) {
         if (path.contains(baseUrl)) {
             return path;
         }
-        return UriUtils.encodePath(baseUrl + path, "UTF-8");
+        return UriUtils.encodePath(baseUrl + path, "UTF-8").replace("&", "%26");
     }
 
     private StaticContentFile getStaticContentFile(String path, String localizationId)

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ protected String prependFullUrlIfNeeded(String path) {`
`347`	`347`	`if (path.contains(baseUrl)) {`
`348`	`348`	`return path;`
`349`	`349`	`}`
`350`		`- return UriUtils.encodePath(baseUrl + path, "UTF-8");`
	`350`	`+ return UriUtils.encodePath(baseUrl + path, "UTF-8").replace("&", "%26");`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`private StaticContentFile getStaticContentFile(String path, String localizationId)`