Skip to content

Commit 873b4aa

Browse files
committed
Take into account the header x-gx-filename at gxobject upload service.
Issue:92168
1 parent beb3aa9 commit 873b4aa

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

java/src/main/java/com/genexus/webpanels/GXObjectUploadServices.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import json.org.json.JSONArray;
88
import json.org.json.JSONObject;
99
import com.genexus.ws.rs.core.*;
10+
import org.apache.commons.io.FilenameUtils;
1011

1112

1213
public class GXObjectUploadServices extends GXWebObjectStub
@@ -74,8 +75,16 @@ protected void doExecute(HttpContext context) throws Exception
7475
{
7576
keyId = HttpUtils.getUploadFileKey();
7677
String contentType = context.getHeader("Content-Type");
77-
ext = getExtension(contentType);
78-
fileName = com.genexus.PrivateUtilities.getTempFileName("tmp");
78+
String gxFileName = context.getHeader("x-gx-filename");
79+
String fName = "";
80+
if (!gxFileName.isEmpty()) {
81+
ext = FilenameUtils.getExtension(gxFileName);
82+
fName = FilenameUtils.getBaseName(gxFileName);
83+
}
84+
else {
85+
ext = getExtension(contentType);
86+
}
87+
fileName = com.genexus.PrivateUtilities.getTempFileName("", fName, "tmp");
7988
String filePath = fileDirPath + fileName;
8089
fileName = fileName.replaceAll(".tmp", "." + ext);
8190
FileItem fileItem = new FileItem(filePath, false, "", context.getRequest().getInputStream().getInputStream());

0 commit comments

Comments
 (0)