Skip to content

restore null check #8172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-matthewb merged 1 commit into from
Oct 14, 2026
Merged

restore null check #8172

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 26 additions & 20 deletions api/src/org/labkey/api/webdav/FileSystemResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.labkey.api.audit.AuditTypeEvent;
import org.labkey.api.audit.provider.FileSystemAuditProvider;
import org.labkey.api.collections.CaseInsensitiveHashSet;
import org.labkey.api.data.Container;
import org.labkey.api.data.SimpleFilter;
import org.labkey.api.data.TableInfo;
import org.labkey.api.exp.api.ExpData;
Expand Down Expand Up @@ -589,30 +590,35 @@ public boolean delete(User user)
if (file == null || (null != user && !canDelete(user, true, null)))
return false;

try {
FileContentService svc = FileContentService.get();
AttachmentDirectory dir;
dir = svc.getMappedAttachmentDirectory(getContainer(), false);
String fileDirPath = file.getParent();

// 23746: If file exists in parent with the same name it was deleted instead
if (dir != null && fileDirPath != null && dir.getFileSystemDirectoryPath().toAbsolutePath().toString().equals(fileDirPath))
// Resources that aren't in a container (e.g., module resources) can't have legacy file attachments
Container c = getContainer();
if (c != null)
{
try
{
// legacy support for files added through the narrow files web part but deleted through
// the newer file browser (issue: 11396). This is the difference between files stored through
// webdav or via the attachments service.
//
Attachment attach = AttachmentService.get().getAttachment(dir, file.getName());
if (attach != null)
FileContentService svc = FileContentService.get();
AttachmentDirectory dir = svc.getMappedAttachmentDirectory(c, false);
String fileDirPath = file.getParent();

// 23746: If file exists in parent with the same name it was deleted instead
if (dir != null && fileDirPath != null && dir.getFileSystemDirectoryPath().toAbsolutePath().toString().equals(fileDirPath))
{
AttachmentService.get().deleteAttachment(dir, file.getName(), null);
return (AttachmentService.get().getAttachment(dir, file.getName()) == null);
// legacy support for files added through the narrow files web part but deleted through
// the newer file browser (issue: 11396). This is the difference between files stored through
// webdav or via the attachments service.
//
Attachment attach = AttachmentService.get().getAttachment(dir, file.getName());
if (attach != null)
{
AttachmentService.get().deleteAttachment(dir, file.getName(), null);
return (AttachmentService.get().getAttachment(dir, file.getName()) == null);
}
}
}
}
catch (Exception e)
{
_log.error(e);
catch (Exception e)
{
_log.error(e);
}
}
boolean deleted = file.delete();
if (!deleted)
Expand Down
Loading