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

IDEMPIERE-2295 AttachmentFileSystem incorrectly deletes attachment from filesystem

This commit is contained in:
Carlos Ruiz 2015-01-14 12:24:22 -05:00
parent dd4e1eba3a
commit f04e3ad89a
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
org.adempiere.base/src/org/compiere/model/AttachmentFileSystem.java
View File

@ -247,19 +247,13 @@ public class AttachmentFileSystem implements IAttachmentStore {
} }
@Override @Override
public boolean delete(MAttachment attach, MStorageProvider prov) { public boolean delete(MAttachment attach, MStorageProvider provider) {
//delete all attachment files and folder String attachmentPathRoot = getAttachmentPathRoot(provider);
for (int i=0; i < attach.m_items.size(); i++) {
final MAttachmentEntry entry = attach.m_items.get(i);
final File file = entry.getFile();
if (file !=null && file.exists()) {
if (!file.delete()) {
log.warning("unable to delete " + file.getAbsolutePath());
}
}
}
String attachmentPathRoot = getAttachmentPathRoot(prov);
final File folder = new File(attachmentPathRoot + getAttachmentPathSnippet(attach)); final File folder = new File(attachmentPathRoot + getAttachmentPathSnippet(attach));
//delete all attachment files and folder
while (attach.m_items.size() > 0) {
deleteEntry(attach, provider, attach.m_items.size()-1);
}
if (folder.exists()) { if (folder.exists()) {
if (!folder.delete()) { if (!folder.delete()) {
log.warning("unable to delete " + folder.getAbsolutePath()); log.warning("unable to delete " + folder.getAbsolutePath());
@ -270,9 +264,11 @@ public class AttachmentFileSystem implements IAttachmentStore {
@Override @Override
public boolean deleteEntry(MAttachment attach, MStorageProvider provider, int index) { public boolean deleteEntry(MAttachment attach, MStorageProvider provider, int index) {
String attachmentPathRoot = getAttachmentPathRoot(provider);
final File folder = new File(attachmentPathRoot + getAttachmentPathSnippet(attach));
//remove files //remove files
final MAttachmentEntry entry = attach.m_items.get(index); final MAttachmentEntry entry = attach.m_items.get(index);
final File file = entry.getFile(); final File file = new File(folder, entry.getName());
if (log.isLoggable(Level.FINE)) log.fine("delete: " + file.getAbsolutePath()); if (log.isLoggable(Level.FINE)) log.fine("delete: " + file.getAbsolutePath());
if (file != null && file.exists()) { if (file != null && file.exists()) {
if (!file.delete()) { if (!file.delete()) {
@ -280,6 +276,7 @@ public class AttachmentFileSystem implements IAttachmentStore {
} }
} }
attach.m_items.remove(index); attach.m_items.remove(index);
attach.save(); // must save here as the operation cannot be rolled back on filesystem
if (log.isLoggable(Level.CONFIG)) log.config("Index=" + index + " - NewSize=" + attach.m_items.size()); if (log.isLoggable(Level.CONFIG)) log.config("Index=" + index + " - NewSize=" + attach.m_items.size());
return true; return true;
} }