Skip to content

NettyClientTransport: use getOrCreate() for new instances of ChannelLogger AttributeKey. #7048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
May 21, 2020
Merged

NettyClientTransport: use getOrCreate() for new instances of ChannelLogger AttributeKey. #7048

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7e19f81
`NettyClientTransport`: use `getOrCreate` for new instances of the `C…
voidzcy May 18, 2020
3115cc7
Merge remote-tracking branch 'origin/master'
Nexproc May 19, 2020
559dd0f
fix line length for linter
Nexproc May 21, 2020
9d61e27
make linter happy
Nexproc May 21, 2020
24b4e20
make coverage happy too
Nexproc May 21, 2020
9f31da4
make the compiler happy
Nexproc May 21, 2020
b6f49d5
maybe make compiler happy?
Nexproc May 21, 2020
193f2b1
make coverage sad and make compiler happy
Nexproc May 21, 2020
ff98c2a
Put semicolon in the end of the line
Nexproc May 21, 2020
e6da351
remove leftover code from previous commit (woops)
Nexproc May 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion netty/src/main/java/io/grpc/netty/NettyClientTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,20 @@
* A Netty-based {@link ConnectionClientTransport} implementation.
*/
class NettyClientTransport implements ConnectionClientTransport {
static final AttributeKey<ChannelLogger> LOGGER_KEY = AttributeKey.newInstance("channelLogger");

/**
* Get the existing {@link ChannelLogger} key in case a separate, isolated class loader has
* already created {@link LOGGER_KEY}.
*/
private static final AttributeKey<ChannelLogger> getOrCreateChannelLogger() {
AttributeKey<ChannelLogger> key = AttributeKey.valueOf("channelLogger");
if (key == null) {
key = AttributeKey.newInstance("channelLogger");
}
return key;
}

static final AttributeKey<ChannelLogger> LOGGER_KEY = getOrCreateChannelLogger();

private final InternalLogId logId;
private final Map<ChannelOption<?>, ?> channelOptions;
Expand Down