Skip to content

Annotate Lock and ReentrantLock. #153

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

Open
cpovirk wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −1
Open

Annotate Lock and ReentrantLock. #153

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
2 changes: 2 additions & 0 deletions src/java.base/share/classes/java/util/concurrent/locks/Lock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
package java.util.concurrent.locks;

import java.util.concurrent.TimeUnit;
import org.jspecify.annotations.NullMarked;

/**
* {@code Lock} implementations provide more extensive locking
Expand Down Expand Up @@ -166,6 +167,7 @@
* @since 1.5
* @author Doug Lea
*/
@NullMarked
public interface Lock {

/**
Expand Down
5 changes: 4 additions & 1 deletion src/java.base/share/classes/java/util/concurrent/locks/ReentrantLock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
import java.util.Collection;
import java.util.concurrent.TimeUnit;
import jdk.internal.vm.annotation.ReservedStackAccess;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;

/**
* A reentrant mutual exclusion {@link Lock} with the same basic
Expand Down Expand Up @@ -106,6 +108,7 @@
* @since 1.5
* @author Doug Lea
*/
@NullMarked
public class ReentrantLock implements Lock, java.io.Serializable {
private static final long serialVersionUID = 7373984872572414699L;
/** @serial Synchronizer providing all implementation mechanics */
Expand Down Expand Up @@ -650,7 +653,7 @@ public final boolean isFair() {
*
* @return the owner, or {@code null} if not owned
*/
protected Thread getOwner() {
protected @Nullable Thread getOwner() {
return sync.getOwner();
}

Expand Down
Loading