Skip to content

Prevent endless loop in lock cycle detection #1510 #1635

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

Closed
wants to merge 1 commit into from
Closed

Prevent endless loop in lock cycle detection #1510 #1635

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: 5 additions & 0 deletions core/src/com/google/inject/internal/CycleDetectingLock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,11 @@ private ListMultimap<Thread, ID> detectPotentialLocksCycle() {
// owner thread depends on current thread, cycle detected
return potentialLocksCycle;
}
// Its possible the lock owner thread has not removed itself yet from the waiting-on-lock list.
// So we remove it here, to prevent an endless loop. See #1510.
if (lockOwnerWaitingOn == this) {
lockThreadIsWaitingOn.remove(this.lockOwnerThread);
}
}
// no dependency path from an owner thread to a current thread
return ImmutableListMultimap.of();
Expand Down