Skip to content

[bot] Merge 26.9 to develop - #1068

Merged
github-actions[bot] merged 2 commits into
developfrom
fb_bot_merge_26.9
Sep 16, 2026
Merged

github-actions[bot] merged 2 commits into
developfrom
fb_bot_merge_26.9

Conversation

@github-actions

Copy link
Copy Markdown

Generated automatically.
Merging changes from: 92f5761
Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
Verify all PRs before approving: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=fb_bot_merge_26.9

cnathe and others added 2 commits September 9, 2026 06:58
#1065)

## Rationale
Found by SignalDataFileWatcherTest on TeamCity running with contextPath
= /labkey. The change makes the WebDAV lookup of the just-copied data
file work when the server runs at a non-root context path.
WebdavService.lookup() expects resolver paths without a contextPath.
Swapping to lookupHref() applies the context-path substring
(WebdavService.java:128-136) so resource resolves, the ExpData gets
created, and the row's DataFile value is rewritten to the local copy.

## Related Pull Requests
- #1061

## Changes
- use WebdavService lookupHref instead of lookup in order to strip the
contextPath prefix
@github-actions
github-actions Bot merged commit 31da355 into develop Sep 16, 2026
3 checks passed
@github-actions
github-actions Bot deleted the fb_bot_merge_26.9 branch September 16, 2026 17:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants