Skip to content

[Blocked] Exclusive Cache Lock #8209

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

Draft
wants to merge 45 commits into
base: master
Choose a base branch
from
Draft

[Blocked] Exclusive Cache Lock #8209

Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
8674a8b
Cache Lock
yschimke Jan 20, 2024
c3df60f
Merge branch 'master' into cache_singleton
yschimke Apr 1, 2024
166a255
Merge branch 'master' into cache_singleton
yschimke Apr 1, 2024
b02738d
Rework
yschimke Apr 1, 2024
ac0cc79
Rework
yschimke Apr 1, 2024
2525edf
Add test
yschimke Apr 1, 2024
7072358
Cleanup
yschimke Apr 1, 2024
5ca131f
Activate missed test
yschimke Apr 1, 2024
0a2fbb6
Cleanup
yschimke Apr 1, 2024
c9db9d4
Avoid checking on non system file systems
yschimke Apr 1, 2024
97e566b
Revert "Avoid checking on non system file systems"
yschimke Apr 1, 2024
ee1daa6
Avoid failing on dns tests
yschimke Apr 1, 2024
3041258
Adding a test
yschimke Apr 2, 2024
7faba3e
Fixes
yschimke Apr 2, 2024
44d3640
Test on more platforms
yschimke Apr 3, 2024
792b689
Cleanup
yschimke Apr 3, 2024
5117f46
Merge branch 'master' into cache_singleton
yschimke Apr 3, 2024
a922b1d
Cleanup
yschimke Apr 3, 2024
e24e146
Fixes
yschimke Apr 6, 2024
04c057f
Fixes
yschimke Apr 6, 2024
5c6c60d
Cache fixes
yschimke Apr 6, 2024
12b7eb9
Cache fixes
yschimke Apr 6, 2024
ae3830d
Cache fixes
yschimke Apr 6, 2024
99a5ee5
Cache fixes
yschimke Apr 6, 2024
cc97769
Cache fixes
yschimke Apr 6, 2024
6dbb03f
Fix test
yschimke Apr 6, 2024
19be22b
Merge branch 'refs/heads/master' into cache_singleton
yschimke Apr 6, 2024
feafff9
Fix test
yschimke Apr 6, 2024
72359a6
avoid windows for now
yschimke Apr 6, 2024
b76aa7f
Fix or skip on windows
yschimke Apr 7, 2024
89e9d80
cleanup
yschimke Apr 7, 2024
28025e2
skip on windows
yschimke Apr 7, 2024
fa707bc
Update DuplexTest.kt
yschimke Apr 7, 2024
c5a87f0
Merge branch 'master' into cache_singleton
yschimke Jan 4, 2025
bb0d4b0
Fixes
yschimke Jan 4, 2025
192e93b
Fixes
yschimke Jan 4, 2025
b4115b2
Fixes
yschimke Jan 4, 2025
2f959af
Fixes
yschimke Jan 4, 2025
7af5705
Fixes
yschimke Jan 4, 2025
4e9d4b3
Fix test
yschimke Jan 11, 2025
019560c
reformat
yschimke Jan 11, 2025
433f6f7
Make it optional
yschimke Jan 11, 2025
b650c9a
Merge branch 'master' into cache_singleton
yschimke May 10, 2025
f9479e8
reformat
yschimke May 10, 2025
498ec0c
Merge branch 'master' into cache_singleton
yschimke Aug 4, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into cache_singleton 
# Conflicts:
#	okcurl/src/test/kotlin/okhttp3/curl/MainTest.kt
#	okhttp/src/commonJvmAndroid/kotlin/okhttp3/Cache.kt
#	okhttp/src/commonJvmAndroid/kotlin/okhttp3/internal/cache/DiskLruCache.kt
  • Loading branch information
@yschimke
yschimke committed May 10, 2025
commit b650c9a3c45d9ff3f0b8a2e96d03ef8e692617e6

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.