Insert an image from an Upload control in SD creates the GXI field wi… (#436)

* Insert an image from an Upload control in SD creates the GXI field with temp extension
Issue: 91160

* Insert an image from an Upload control in SD creates the GXI field with temp extension
Issue: 91160

Author: iroqueta

java/src/main/java/com/genexus/db/driver/GXPreparedStatement.java

@@ -35,6 +35,7 @@
 
 import com.genexus.*;
 import com.genexus.common.classes.IGXPreparedStatement;
+import com.genexus.common.interfaces.SpecificImplementation;
 import com.genexus.internet.HttpContext;
 import com.genexus.util.GXFile;
 import com.genexus.util.GXServices;
@@ -954,6 +955,7 @@ public void setGXDbFileURI(int index, String fileName, String blobPath, int leng
 
 		fileName = fileName.trim();
 		blobPath = blobPath.trim();
+		String uploadNameValue = SpecificImplementation.GXutil.getUploadNameValue(blobPath);
 
 		//EMPTY BLOB
     	if (blobPath == null || blobPath.trim().length() == 0) {
@@ -971,7 +973,7 @@ else if (blobPath.trim().length() > 0)
 		{
 			blobPath = com.genexus.GXutil.cutUploadPrefix(blobPath);
 			File file = new File(blobPath);
-			fileUri = GXDbFile.generateUri(file.getName(), !GXDbFile.hasToken(blobPath), true);
+			fileUri = GXDbFile.generateUri(uploadNameValue.isEmpty()?file.getName(): uploadNameValue, !GXDbFile.hasToken(blobPath), true);
 		}
 
 		boolean externalStorageEnabled = storageProvider != null;
@@ -1016,7 +1018,7 @@ else if (blobPath.trim().length() > 0)
 				GXFile gxFile = new GXFile(storageTargetObjectName, ResourceAccessControlList.Private); //Every temporal file is saved as private.
 				if (gxFile.exists()) {
 					// - 1. WebUpload: The URL is an External Storage URL in the Private Temp Storage Folder.
-					fileName = gxFile.getName();
+					fileName = uploadNameValue.isEmpty()? gxFile.getName(): uploadNameValue;
 					int idx = fileName.lastIndexOf("/");
 					if ((idx != -1) && (idx < fileName.length() - 1)) {
 						fileName = fileName.substring(idx + 1);