Skip to content

Commit

Permalink
Merge #3357 into 2.0.0-M4
Browse files Browse the repository at this point in the history
  • Loading branch information
violetagg committed Jul 18, 2024
2 parents e9b54c6 + 5483284 commit 7e89364
Showing 1 changed file with 6 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2023 VMware, Inc. or its affiliates, All Rights Reserved.
* Copyright (c) 2011-2024 VMware, Inc. or its affiliates, All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -127,12 +127,12 @@ else if (recorder instanceof ContextAwareChannelMetricsRecorder contextAwareChan
final FluxReceive inbound;
final ConnectionObserver listener;
final Sinks.Empty<Void> onTerminate;
final String shortId;

volatile Subscription outboundSubscription;

boolean localActive;
String longId;
String shortId;

protected ChannelOperations(ChannelOperations<INBOUND, OUTBOUND> replaced) {
this.connection = replaced.connection;
Expand All @@ -155,7 +155,6 @@ public ChannelOperations(Connection connection, ConnectionObserver listener) {
this.listener = requireNonNull(listener, "listener");
this.onTerminate = Sinks.unsafe().empty();
this.inbound = new FluxReceive(this);
shortId = initShortId();
}

@Nullable
Expand Down Expand Up @@ -592,6 +591,10 @@ public Context currentContext() {

@Override
public String asShortText() {
if (shortId == null) {
shortId = initShortId();
}

return shortId;
}

Expand Down

0 comments on commit 7e89364

Please sign in to comment.