core: allow Java 7 source and bytecode #4801
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ejona86
reviewed
Aug 27, 2018
| @@ -74,7 +74,7 @@ void cancel(boolean permanent) { | |||
| } | |||
| } | |||
|
|
|||
| private static final class FutureRunnable implements Runnable { | |||
| private final class FutureRunnable implements Runnable { | |||
|
|
|||
| private final Rescheduler rescheduler; | |||
There was a problem hiding this comment.
Remove this as well? Otherwise it could be pretty confusing.
ericgribkoff
force-pushed
the
core_jdk17
branch
from
089e454 to
f5456d5
Compare
The JDK will produce code that invokes Object.requireNonNull when instantiating an inner class using a instance variable. See https://bugs.openjdk.java.net/browse/JDK-8202137
ericgribkoff
force-pushed
the
core_jdk17
branch
from
f5456d5 to
c6de176
Compare
ejona86
reviewed
Aug 27, 2018
| Rescheduler.this.serializingExecutor.execute(new ChannelFutureRunnable()); | ||
| } | ||
|
|
||
| private boolean isEnabled() { |
There was a problem hiding this comment.
Oh... Sorry, I missed that. A bit of a pain. Whatever.
ejona86
approved these changes
Aug 27, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
(This PR is a follow-up for an issue identified in #4799 and should not be merged without that change)
javac can produce code that invokes Object.requireNonNull when instantiating
an inner class using a instance variable. See
https://bugs.openjdk.java.net/browse/JDK-8202137
@ejona86 From the linked bug, I don't see that there is an option here other than marking the inner class non-static. It's slightly unsettling that we apparently need animalsniffer to catch javac including code that isn't present on old Android devices; I haven't had time to check if the android build system would otherwise do something fancy here to avoid issues at runtime on older devices.
If this looks alright, do you want to cherry-pick this commit into #4799, or keep this as a stand-alone PR?