Repository navigation
fix(java): leave nothing that can throw between taking a router lease and releasing it - #1329
Merged
NandhaKishorM merged 1 commit intoOct 24, 2026
Conversation
… and releasing it In `predict`, the `languageFor(...)` call sat between the lease acquisition and the `try (Lease held = lease)` that releases it; in `predictBatch`, the `contexts`/`indexOf` allocations did. Neither throws today, but an `OutOfMemoryError` from either would leave the lease held with no owner able to release it — the same shape as the unreleased lock CodeQL found in `Router.build`. `languageFor` now runs inside the try; the two collections are built before the acquisition. The statement after taking a lease is the one that releases it. Verified: ./gradlew test (JDK 17) 1182 tests, only the two inherited failures of NandhaKishorM#1323 (which is the language-detection expectations, not this path).
NandhaKishorM
added a commit
that referenced
this pull request
Oct 24, 2026
33 PRs. Server hardening (#1331, #1332, #1333), TypeScript parity (#1330, #1336, #1337, #1338, #1339, #1340, #1341, #1342, #1343), fail-closed input handling in evals and the integrations (#1317, #1318, #1319, #1320, #1321, #1322, #1326, #1335), exact and faster script detection (#1334, #1349), JVM and .NET resource handling (#1327, #1328, #1329, #1346), port goldens and clipping (#1324 excluded, #1325, #1344, #1345), CI (#1323, #1347, #1348). Verified before tagging: all 92 suites pass, 610 tests. ruff clean on both lists. laya-ts 1247 tests across 44 files, tsc --noEmit clean. Version agrees across pyproject.toml, laya.__version__ and nix/package.nix. README carries 0.4.15 only. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Close the window between taking a router
Leaseand entering thetrythat releases it.predict: thelanguageFor(decision, lang)call moves insidetry (Lease held = lease);predictBatch: thecontexts/indexOfallocations move abovelease(checkpoint), so thestatement after the acquisition is the one that releases it.
Why
Both methods acquire a lease before a
try-with-resources that returns it:That gap is where a leak lives. Nothing in it throws today —
languageForonly reads a record andnormalises a language tag — but the shape is exactly the one this file has already got wrong once: a
finallyinRouter.buildthat calledfinish(...)beforelock.unlock()shipped an unreleasedlock that CodeQL caught on its first run. In
predictBatchthe two allocations in the same positionare the only realistic throwers left (
OutOfMemoryError), and an error there would leave the leaseheld with no owner able to release it.
The behaviour is unchanged:
failedBeforeStartstill observes a failure to route or load, andlanguageForis still computed before any hook runs, because it is the first statement inside theblock.
How it was verified
Both failures are #1323's stale language-detection assertions on
main, not this path:RouterTest.abstainingHintFallsThrough(expectedMULTILINGUAL, gotENGLISH) andRouterLifecycleTest.closeFreesAndSeals(same expectation, after close). I reproduced both on aclean worktree of
upstream/mainat 0a05a45 before touching anything.The hook-ordering tests that pin this method's contract —
AgentHooksTest,HooksTest,RouterTest's routing cases,RouterLifecycleTest's lease accounting — pass.Checklist
main(upstream/mainat 0a05a45)