#20629 : Back-porting code changes to dotCMS 21.06.2 LTS release.

dotCMS · Aug 15, 2021 · e796f48 · e796f48
1 parent f105bb3
commit e796f48
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/dotCMS/src/main/java/com/dotcms/ema/EMAWebInterceptor.java b/dotCMS/src/main/java/com/dotcms/ema/EMAWebInterceptor.java
@@ -4,6 +4,7 @@
 import com.dotmarketing.exception.DotDataException;
 import com.dotmarketing.exception.DotSecurityException;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -99,7 +100,7 @@ public boolean afterIntercept(final HttpServletRequest request, final HttpServle
                 final ProxyResponse pResponse = proxy.sendPost(proxyUrl.get(), params);
 
                 if (pResponse.getResponseCode() == 200) {
-                    responseStringBuilder.append(new String(pResponse.getResponse()));
+                    responseStringBuilder.append(new String(pResponse.getResponse(), StandardCharsets.UTF_8.name()));
                 }else {
                     responseStringBuilder.append("<html><body>")
                     .append("<h3>Unable to connect with the rendering engine</h3>")

diff --git a/dotCMS/src/main/java/com/dotcms/ema/proxy/MockHttpCaptureResponse.java b/dotCMS/src/main/java/com/dotcms/ema/proxy/MockHttpCaptureResponse.java
@@ -18,7 +18,7 @@
 public class MockHttpCaptureResponse extends HttpServletResponseWrapper implements MockResponse {
 
 
-    ByteArrayOutputStream bout = new ByteArrayOutputStream(4096);
+    ByteArrayOutputStream bout = new ByteArrayOutputStream(4096*8);
     ServletOutputStream out = null;
 
     public MockHttpCaptureResponse(HttpServletResponse response) {

diff --git a/hotfix_tracking.md b/hotfix_tracking.md
@@ -7,4 +7,6 @@ This maintenance release includes the following code fixes:
 
 2. https://github.com/dotCMS/core/issues/20647 : Problems the first time you try to navigate to the network tab
 
-3. https://github.com/dotCMS/core/issues/20636 : Improving error messages for WorkflowAPIImpl
+3. https://github.com/dotCMS/core/issues/20636 : Improving error messages for WorkflowAPIImpl
+
+4. https://github.com/dotCMS/core/issues/20629 : EMA should always expect UTF8