Skip to content

Commit 56084fe

Browse files
cpovirkGoogle Java Core Libraries
authored and
Google Java Core Libraries
committed
In ClosingFuture, remove a workaround for [JDK-7101822](https://bugs.openjdk.java.net/browse/JDK-7101822)(?) now that we [build with a JDK after JDK 8](#6549). This follows up on cl/332225001 and cl/643394004.
RELNOTES=n/a PiperOrigin-RevId: 706691218
1 parent 617fd28 commit 56084fe

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

android/guava/src/com/google/common/util/concurrent/ClosingFuture.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -1223,9 +1223,7 @@ private Peeker(ImmutableList<ClosingFuture<?>> futures) {
12231223
* .closing(executor);
12241224
* }</pre>
12251225
*/
1226-
// TODO(cpovirk): Use simple name instead of fully qualified after we stop building with JDK 8.
1227-
@com.google.errorprone.annotations.DoNotMock(
1228-
"Use ClosingFuture.whenAllSucceed() or .whenAllComplete() instead.")
1226+
@DoNotMock("Use ClosingFuture.whenAllSucceed() or .whenAllComplete() instead.")
12291227
public static class Combiner {
12301228

12311229
private final CloseableList closeables = new CloseableList();

guava/src/com/google/common/util/concurrent/ClosingFuture.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -1228,9 +1228,7 @@ private Peeker(ImmutableList<ClosingFuture<?>> futures) {
12281228
* .closing(executor);
12291229
* }</pre>
12301230
*/
1231-
// TODO(cpovirk): Use simple name instead of fully qualified after we stop building with JDK 8.
1232-
@com.google.errorprone.annotations.DoNotMock(
1233-
"Use ClosingFuture.whenAllSucceed() or .whenAllComplete() instead.")
1231+
@DoNotMock("Use ClosingFuture.whenAllSucceed() or .whenAllComplete() instead.")
12341232
public static class Combiner {
12351233

12361234
private final CloseableList closeables = new CloseableList();

0 commit comments

Comments
 (0)