Skip to content

Commit 6026a81

Browse files
author
kasemir
committed
Explain remaining tcp null check
1 parent 859a158 commit 6026a81

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

core/pva/src/main/java/org/epics/pva/client/ChannelSearch.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public void register(final PVAChannel channel, final boolean now)
276276
int bucket = current_search_bucket.get();
277277
if (!now)
278278
bucket = (bucket + SEARCH_SOON_DELAY) % search_buckets.size();
279-
search_buckets.get(bucket).add(sc);
279+
search_buckets.get(bucket).add(sc);
280280
}
281281

282282
// Jumpstart search instead of waiting up to ~1 second for current bucket to be handled
@@ -454,9 +454,8 @@ private void search(final Collection<SearchRequest.Channel> channels)
454454
// This is configured in EPICS_PVA_NAME_SERVERS via prefix pvas://
455455
final ClientTCPHandler tcp = tcp_provider.apply(name_server.getAddress(), name_server.isTLS());
456456

457-
// In case of connection errors (TCP connection blocked by firewall),
458-
// tcp will be null
459-
// TODO CHECK THAT with updated ClientTCPHandler that connects on receive thread
457+
// In older implementation, tcp was null in case of connection errors (TCP connection blocked by firewall).
458+
// No longer expected to happen but check anyway
460459
if (tcp != null)
461460
{
462461
final RequestEncoder search_request = (version, buffer) ->

0 commit comments

Comments
 (0)