Skip to content

Issue #1495: Avoid non-short-circuit logic in FileClientHelper #1497

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
thboileau merged 1 commit into from
Mar 8, 2026
Merged

Issue #1495: Avoid non-short-circuit logic in FileClientHelper #1497

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ Changes log

- 2.7 Milestone 3 (??-??-2025)
- Bugs fixed
- Reuse an instance of Random class in RandomUtils. Issue #1487.
- Complete test classes. Issue #1490.
- Reuse an instance of Random class in RandomUtils. Issue #1487.
- Complete test classes. Issue #1490.
- Avoid non-short-circuit logic in FileClientHelper. Issue #1495.

- 2.7 Milestone 2 (29-06-2025)
- Misc
Expand Down
2 changes: 1 addition & 1 deletion org.restlet/src/main/java/org/restlet/engine/local/FileClientHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ private static boolean isFileInDirectory(final Directory directory, final File f
final String fileAbsolute = directory.getRootRef().getPath(true);
final String filePath;

if (fileAbsolute.indexOf(':') == 2 | fileAbsolute.indexOf('|') == 2) {
if (fileAbsolute.indexOf(':') == 2 || fileAbsolute.indexOf('|') == 2) {
filePath = fileAbsolute.substring(1);
} else {
filePath = fileAbsolute;
Expand Down
Loading