Skip to content

Commit 18285fc

Browse files
author
Viktor Klang
committed
8356553: Incorrect uses of {@link} in AbstractQueuedLongSynchronizer and AbstractQueuedSynchronizer
Reviewed-by: alanb
1 parent 1a65719 commit 18285fc

File tree

2 files changed

+24
-23
lines changed

2 files changed

+24
-23
lines changed

src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,8 +1303,8 @@ private ConditionNode newConditionNode() {
13031303
* <li>Invoke {@link #release} with saved state as argument,
13041304
* throwing IllegalMonitorStateException if it fails.
13051305
* <li>Block until signalled.
1306-
* <li>Reacquire by invoking specialized version of
1307-
* {@link #acquire} with saved state as argument.
1306+
* <li>Reacquire by invoking underlying version of
1307+
* {@link #acquire(long)} with saved state as argument.
13081308
* </ol>
13091309
*/
13101310
public final void awaitUninterruptibly() {
@@ -1346,8 +1346,8 @@ else if ((node.status & COND) != 0) {
13461346
* <li>Invoke {@link #release} with saved state as argument,
13471347
* throwing IllegalMonitorStateException if it fails.
13481348
* <li>Block until signalled or interrupted.
1349-
* <li>Reacquire by invoking specialized version of
1350-
* {@link #acquire} with saved state as argument.
1349+
* <li>Reacquire by invoking underlying version of
1350+
* {@link #acquire(long)} with saved state as argument.
13511351
* <li>If interrupted while blocked in step 4, throw InterruptedException.
13521352
* </ol>
13531353
*/
@@ -1398,8 +1398,8 @@ public final void await() throws InterruptedException {
13981398
* <li>Invoke {@link #release} with saved state as argument,
13991399
* throwing IllegalMonitorStateException if it fails.
14001400
* <li>Block until signalled, interrupted, or timed out.
1401-
* <li>Reacquire by invoking specialized version of
1402-
* {@link #acquire} with saved state as argument.
1401+
* <li>Reacquire by invoking underlying version of
1402+
* {@link #acquire(long)} with saved state as argument.
14031403
* <li>If interrupted while blocked in step 4, throw InterruptedException.
14041404
* </ol>
14051405
*/
@@ -1442,8 +1442,8 @@ public final long awaitNanos(long nanosTimeout)
14421442
* <li>Invoke {@link #release} with saved state as argument,
14431443
* throwing IllegalMonitorStateException if it fails.
14441444
* <li>Block until signalled, interrupted, or timed out.
1445-
* <li>Reacquire by invoking specialized version of
1446-
* {@link #acquire} with saved state as argument.
1445+
* <li>Reacquire by invoking underlying version of
1446+
* {@link #acquire(long)} with saved state as argument.
14471447
* <li>If interrupted while blocked in step 4, throw InterruptedException.
14481448
* <li>If timed out while blocked in step 4, return false, else true.
14491449
* </ol>
@@ -1485,8 +1485,8 @@ public final boolean awaitUntil(Date deadline)
14851485
* <li>Invoke {@link #release} with saved state as argument,
14861486
* throwing IllegalMonitorStateException if it fails.
14871487
* <li>Block until signalled, interrupted, or timed out.
1488-
* <li>Reacquire by invoking specialized version of
1489-
* {@link #acquire} with saved state as argument.
1488+
* <li>Reacquire by invoking underlying version of
1489+
* {@link #acquire(long)} with saved state as argument.
14901490
* <li>If interrupted while blocked in step 4, throw InterruptedException.
14911491
* <li>If timed out while blocked in step 4, return false, else true.
14921492
* </ol>

src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,10 @@
8686
* #isHeldExclusively} reports whether synchronization is exclusively
8787
* held with respect to the current thread, method {@link #release}
8888
* invoked with the current {@link #getState} value fully releases
89-
* this object, and {@link #acquire}, given this saved state value,
90-
* eventually restores this object to its previous acquired state. No
91-
* {@code AbstractQueuedSynchronizer} method otherwise creates such a
89+
* this object, and the underlying version of {@link #acquire(int)},
90+
* given this saved state value, eventually restores this object to
91+
* its previous acquired state.
92+
* No {@code AbstractQueuedSynchronizer} method otherwise creates such a
9293
* condition, so if this constraint cannot be met, do not use it. The
9394
* behavior of {@link ConditionObject} depends of course on the
9495
* semantics of its synchronizer implementation.
@@ -1682,8 +1683,8 @@ private ConditionNode newConditionNode() {
16821683
* <li>Invoke {@link #release} with saved state as argument,
16831684
* throwing IllegalMonitorStateException if it fails.
16841685
* <li>Block until signalled.
1685-
* <li>Reacquire by invoking specialized version of
1686-
* {@link #acquire} with saved state as argument.
1686+
* <li>Reacquire by invoking underlying version of
1687+
* {@link #acquire(int)} with saved state as argument.
16871688
* </ol>
16881689
*/
16891690
public final void awaitUninterruptibly() {
@@ -1725,8 +1726,8 @@ else if ((node.status & COND) != 0) {
17251726
* <li>Invoke {@link #release} with saved state as argument,
17261727
* throwing IllegalMonitorStateException if it fails.
17271728
* <li>Block until signalled or interrupted.
1728-
* <li>Reacquire by invoking specialized version of
1729-
* {@link #acquire} with saved state as argument.
1729+
* <li>Reacquire by invoking underlying version of
1730+
* {@link #acquire(int)} with saved state as argument.
17301731
* <li>If interrupted while blocked in step 4, throw InterruptedException.
17311732
* </ol>
17321733
*/
@@ -1777,8 +1778,8 @@ public final void await() throws InterruptedException {
17771778
* <li>Invoke {@link #release} with saved state as argument,
17781779
* throwing IllegalMonitorStateException if it fails.
17791780
* <li>Block until signalled, interrupted, or timed out.
1780-
* <li>Reacquire by invoking specialized version of
1781-
* {@link #acquire} with saved state as argument.
1781+
* <li>Reacquire by invoking underlying version of
1782+
* {@link #acquire(int)} with saved state as argument.
17821783
* <li>If interrupted while blocked in step 4, throw InterruptedException.
17831784
* </ol>
17841785
*/
@@ -1821,8 +1822,8 @@ public final long awaitNanos(long nanosTimeout)
18211822
* <li>Invoke {@link #release} with saved state as argument,
18221823
* throwing IllegalMonitorStateException if it fails.
18231824
* <li>Block until signalled, interrupted, or timed out.
1824-
* <li>Reacquire by invoking specialized version of
1825-
* {@link #acquire} with saved state as argument.
1825+
* <li>Reacquire by invoking underlying version of
1826+
* {@link #acquire(int)} with saved state as argument.
18261827
* <li>If interrupted while blocked in step 4, throw InterruptedException.
18271828
* <li>If timed out while blocked in step 4, return false, else true.
18281829
* </ol>
@@ -1864,8 +1865,8 @@ public final boolean awaitUntil(Date deadline)
18641865
* <li>Invoke {@link #release} with saved state as argument,
18651866
* throwing IllegalMonitorStateException if it fails.
18661867
* <li>Block until signalled, interrupted, or timed out.
1867-
* <li>Reacquire by invoking specialized version of
1868-
* {@link #acquire} with saved state as argument.
1868+
* <li>Reacquire by invoking underlying version of
1869+
* {@link #acquire(int)} with saved state as argument.
18691870
* <li>If interrupted while blocked in step 4, throw InterruptedException.
18701871
* <li>If timed out while blocked in step 4, return false, else true.
18711872
* </ol>

0 commit comments

Comments
 (0)