Author: kwright
Date: Fri Feb 12 17:20:54 2021
New Revision: 1886468
URL: http://svn.apache.org/viewvc?rev=1886468&view=rev
Log:
Fix for CONNECTORS-1661.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/multipart/MultipartWrapper.java
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1886468&r1=1886467&r2=1886468&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Fri Feb 12 17:20:54 2021
@@ -3,6 +3,10 @@ $Id$
======================= 2.19-dev =====================
+CONNECTORS-1661: Encoding for multipart requests is sometimes not set by the
new
+UI, so assume UTF-8 if that happens.
+(Julien Massiera)
+
CONNECTORS-1662: Apparently sometimes JIRA doesn't form the encoding properly.
(Julien Massiera)
Modified:
manifoldcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/multipart/MultipartWrapper.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/multipart/MultipartWrapper.java?rev=1886468&r1=1886467&r2=1886468&view=diff
==============================================================================
---
manifoldcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/multipart/MultipartWrapper.java
(original)
+++
manifoldcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/multipart/MultipartWrapper.java
Fri Feb 12 17:20:54 2021
@@ -49,6 +49,15 @@ public class MultipartWrapper implements
public MultipartWrapper(HttpServletRequest request, AdminProfile
adminProfile)
throws ManifoldCFException
{
+ // First of all make sure to have a correct charset
+ if(request.getCharacterEncoding() == null) {
+ try {
+ request.setCharacterEncoding("UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ throw new ManifoldCFException(e.getMessage(), e);
+ }
+ }
+
this.adminProfile = adminProfile;
// Check that we have a file upload request
