| commit | e66c7680c407c54121a5ce23c931739c33e4c9cd | [log] [tgz] |
|---|---|---|
| author | Cousjava <jonathan.coustick@payara.fish> | Tue Nov 19 17:16:29 2019 +0000 |
| committer | GitHub <noreply@github.com> | Tue Nov 19 17:16:29 2019 +0000 |
| tree | 0577a1f50fed4b1da1ae93714e7a381e5453b1d4 | |
| parent | 3ffa16725c162954f40cc15f745625a554d44763 [diff] | |
| parent | 53ba19562bc79ebedd7ff90f5047c62c0a1f4aa5 [diff] |
Merge pull request #22847 from endtak/issue_22846 The response sender and receiver use the same encoding
diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/reader/MultipartProprietaryReader.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/reader/MultipartProprietaryReader.java index 2cde5a0..c24cf43 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/reader/MultipartProprietaryReader.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/reader/MultipartProprietaryReader.java
@@ -97,6 +97,7 @@ String name = "noname"; if (cdParams.containsKey("name")) { name = cdParams.getProperty("name"); + name = new String(name.getBytes("ISO8859-1"), "UTF-8"); } else if (cdParams.containsKey("filename")) { name = cdParams.getProperty("filename"); }
diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/writer/MultipartProprietaryWriter.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/writer/MultipartProprietaryWriter.java index 8e93efa..147c9c0 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/writer/MultipartProprietaryWriter.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/writer/MultipartProprietaryWriter.java
@@ -193,7 +193,7 @@ } contentTypeWriter.writeContentType("multipart", ctType, boundary); // Write content - final Writer writer = new BufferedWriter(new OutputStreamWriter(os)); + final Writer writer = new BufferedWriter(new OutputStreamWriter(os, "UTF-8")); // boolean isFirst = true; //Parameters if (parameters != null) {