midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-3836 jasper attachment: two report/process use jasper have attachment file has duplicate name, one will win and other loss (#730)

This commit is contained in:
hengsin 2021-06-19 03:16:09 +08:00 committed by GitHub
parent d5845fcffe
commit b0f8c603c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
org.adempiere.report.jasper/src/org/adempiere/report/jasper/ReportStarter.java
View File

@ -253,8 +253,8 @@ public class ReportStarter implements ProcessCall, ClientProcess
String[] tmps = reportLocation.split("/"); String[] tmps = reportLocation.split("/");
String cleanFile = tmps[tmps.length-1]; String cleanFile = tmps[tmps.length-1];
String localFile = System.getProperty("java.io.tmpdir") + System.getProperty("file.separator") + cleanFile; String localFile = getLocalDownloadFolder() + cleanFile;
String downloadedLocalFile = System.getProperty("java.io.tmpdir") + System.getProperty("file.separator")+"TMP" + cleanFile; String downloadedLocalFile = getLocalDownloadFolder() + "TMP_" + cleanFile;
reportFile = new File(localFile); reportFile = new File(localFile);
if (reportFile.exists()) if (reportFile.exists())
@ -1183,7 +1183,7 @@ public class ReportStarter implements ProcessCall, ClientProcess
log.info("getting resource from = " + getClass().getClassLoader().getResource(name)); log.info("getting resource from = " + getClass().getClassLoader().getResource(name));
} }
InputStream inputStream = getClass().getClassLoader().getResourceAsStream(name); InputStream inputStream = getClass().getClassLoader().getResourceAsStream(name);
String localFile = System.getProperty("java.io.tmpdir") + System.getProperty("file.separator") + localName; String localFile = getLocalDownloadFolder() + localName;
if (log.isLoggable(Level.INFO)) log.info("localFile = " + localFile); if (log.isLoggable(Level.INFO)) log.info("localFile = " + localFile);
reportFile = new File(localFile); reportFile = new File(localFile);
@ -1246,8 +1246,8 @@ public class ReportStarter implements ProcessCall, ClientProcess
* @return File * @return File
*/ */
private File getAttachmentEntryFile(MAttachmentEntry entry) { private File getAttachmentEntryFile(MAttachmentEntry entry) {
String localFile = System.getProperty("java.io.tmpdir") + System.getProperty("file.separator") + entry.getName(); String localFile = getLocalDownloadFolder() + entry.getName();
String downloadedLocalFile = System.getProperty("java.io.tmpdir") + System.getProperty("file.separator")+"TMP" + entry.getName(); String downloadedLocalFile = getLocalDownloadFolder()+"TMP_" + entry.getName();
File reportFile = new File(localFile); File reportFile = new File(localFile);
if (reportFile.exists()) { if (reportFile.exists()) {
String localMD5hash = DigestOfFile.getMD5Hash(reportFile); String localMD5hash = DigestOfFile.getMD5Hash(reportFile);
@ -1274,6 +1274,19 @@ public class ReportStarter implements ProcessCall, ClientProcess
return reportFile; return reportFile;
} }
private String getLocalDownloadFolder() {
String path = System.getProperty("java.io.tmpdir") + System.getProperty("file.separator")
+ "jasperreport_"+processInfo.getAD_Process_ID() + System.getProperty("file.separator");
Path p = Path.of(path);
try {
if (!Files.exists(p))
Files.createDirectory(p);
} catch (IOException e) {
throw new RuntimeException(e);
}
return path;
}
/** /**
* Update AD_PInstance result and error message * Update AD_PInstance result and error message
* @author rlemeill * @author rlemeill