| # | Line 1920 | Line 1920 | public class CompletableFuture<T> implem | |
|---|---|---|
| 1920 | if (r == null) | |
| 1921 | cleanStack(); | |
| 1922 | } | |
| 1923 | < | if (r == null && !interrupted) |
| 1924 | < | throw new TimeoutException(); |
| 1925 | < | else if (r != null) { |
| 1923 | > | if (r != null) { |
| 1924 | if (interrupted) | |
| 1925 | Thread.currentThread().interrupt(); | |
| 1926 | postComplete(); | |
| 1927 | < | } |
| 1928 | < | return r; |
| 1927 | > | return r; |
| 1928 | > | } else if (interrupted) |
| 1929 | > | return null; |
| 1930 | > | else |
| 1931 | > | throw new TimeoutException(); |
| 1932 | } | |
| 1933 | ||
| 1934 | /* ------------- public methods -------------- */ | |
| – | Removed lines |
| + | Added lines |
| < | Changed lines |
| > | Changed lines |