Skip to content

[bot] Merge 26.9 to develop #1068

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
github-actions merged 2 commits into from
Sep 16, 2026
Merged

[bot] Merge 26.9 to develop #1068

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92f5761
SignalDataImportTask fix to support WebDAV URL that has a context pat…
cnathe Sep 9, 2026
31da355
Merge 26.9 to develop
labkey-teamcity Sep 16, 2026
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
5 changes: 3 additions & 2 deletions signalData/src/org/labkey/signaldata/pipeline/SignalDataImportTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,8 @@ public RecordedActionSet run()
URI uri = FileContentService.get().getWebDavUrl(destFile, container, FileContentService.PathType.full);
if (uri != null)
{
WebdavResource resource = WebdavService.get().lookup(uri.getPath());
// use lookupHref() as the WebDAV URL carries the context path
WebdavResource resource = WebdavService.get().lookupHref(uri.toString());
if (resource != null)
{
ExpData data = FileContentService.get().getDataObject(resource, container);
Expand All @@ -239,7 +240,7 @@ public RecordedActionSet run()
row.replace(INPUT_DATA_FILE, dataFileUrl.replace("file:", ""));
}
else
log.warn("Unable to locate the webdav resource at {}", uri.getPath());
log.warn("Unable to locate the webdav resource at {}", uri);
}
else
log.warn("Unable to resolve a webdav URL for {}", destFile.getName());
Expand Down
Loading