Tries to determine the content-type of files uploaded to external storage. Previously, if the file extension was .tmp, it was always set to image/jpeg, which caused issues—such as when uploading a PDF: upon downloading it, the file couldn't be opened properly.

Author: iroqueta

gxcloudstorage-azureblob/src/main/java/com/genexus/db/driver/ExternalProviderAzureStorage.java

@@ -138,17 +138,17 @@ public String upload(String localFile, String externalFileName, ResourceAccessCo
 	}
 
 	public String upload(String externalFileName, InputStream input, ResourceAccessControlList acl) {
-
+		ExternalProviderHelper.InputStreamWithLength streamInfo = null;
 		try {
+			streamInfo = ExternalProviderHelper.getInputStreamContentLength(input);
+
 			CloudBlockBlob blob = getCloudBlockBlob(externalFileName, acl);
-			if (externalFileName.endsWith(".tmp")) {
-				blob.getProperties().setContentType("image/jpeg");
-			}
+			blob.getProperties().setContentType((externalFileName.endsWith(".tmp") && "application/octet-stream".equals(streamInfo.detectedContentType)) ? "image/jpeg" : streamInfo.detectedContentType);
 			try (BlobOutputStream blobOutputStream = blob.openOutputStream()) {
-				int next = input.read();
-				while (next != -1) {
-					blobOutputStream.write(next);
-					next = input.read();
+				byte[] buffer = new byte[8192];
+				int bytesRead;
+				while ((bytesRead = streamInfo.inputStream.read(buffer)) != -1) {
+					blobOutputStream.write(buffer, 0, bytesRead);
 				}
 			}
 			return getResourceUrl(externalFileName, acl, DEFAULT_EXPIRATION_MINUTES);
@@ -162,6 +162,15 @@ public String upload(String externalFileName, InputStream input, ResourceAccessC
 			logger.error("Error uploading file", ex);
 			return "";
 		}
+		finally {
+			if (streamInfo != null && streamInfo.tempFile != null && streamInfo.tempFile.exists()) {
+				try {
+					streamInfo.tempFile.delete();
+				} catch (Exception e) {
+					logger.warn("Could not delete temporary file: " + streamInfo.tempFile.getAbsolutePath(), e);
+				}
+			}
+		}
 	}
 
 	public String get(String externalFileName, ResourceAccessControlList acl, int expirationMinutes) {