root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Polish contribution 

See gh-29150
This commit is contained in:
Sam Brannen 2022-09-14 14:35:43 +02:00
parent 35d379f9d3
commit 529481c44c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-core/src/main/java/org/springframework/util/concurrent/SettableListenableFuture.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -114,7 +114,8 @@ public class SettableListenableFuture<T> implements ListenableFuture<T> {
* {@link java.util.concurrent.CancellationException} if the future has been cancelled. * {@link java.util.concurrent.CancellationException} if the future has been cancelled.
* @return the value associated with this future * @return the value associated with this future
*/ */
@Override @Nullable @Nullable
@Override
public T get() throws InterruptedException, ExecutionException { public T get() throws InterruptedException, ExecutionException {
return this.settableTask.get(); return this.settableTask.get();
} }
@ -129,6 +130,7 @@ public class SettableListenableFuture<T> implements ListenableFuture<T> {
* @param unit the unit of the timeout argument * @param unit the unit of the timeout argument
* @return the value associated with this future * @return the value associated with this future
*/ */
@Nullable
@Override @Override
public T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException { public T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
return this.settableTask.get(timeout, unit); return this.settableTask.get(timeout, unit);