Skip to content

PVA client: Fix ConcurrentModificationException in search #3523

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
kasemir merged 2 commits into from
Sep 2, 2025
Merged

PVA client: Fix ConcurrentModificationException in search #3523

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee8eb2d
PVA client: Fix ConcurrentModificationException in search
Aug 28, 2025
4b1dbf7
PVA: "unchecked" cast has been removed
Aug 28, 2025
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
14 changes: 5 additions & 9 deletions core/pva/src/main/java/org/epics/pva/client/ChannelSearch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,17 +342,13 @@ public synchronized void boost()
}
}

/** List of channels to search, re-used within runSearches */
private final ArrayList<PVAChannel> to_search = new ArrayList<>();

/** Invoked by timer: Check searched channels for the next one to handle */
@SuppressWarnings("unchecked")
private void runSearches()
{
// Determine current search bucket
final int current = current_search_bucket.getAndUpdate(i -> (i + 1) % search_buckets.size());
// Collect channels to be searched while sync'ed
to_search.clear();
final ArrayList<SearchRequest.Channel> to_search = new ArrayList<>();
synchronized (this)
{
final Set<SearchedChannel> bucket = search_buckets.get(current);
Expand Down Expand Up @@ -406,7 +402,7 @@ private void runSearches()
int count = 0;
while (start + count < to_search.size() && count < Short.MAX_VALUE-1)
{
final PVAChannel channel = to_search.get(start + count);
final SearchRequest.Channel channel = to_search.get(start + count);
int size = 4 + PVAString.getEncodedSize(channel.getName());
if (payload + size < MAX_SEARCH_PAYLOAD)
{
Expand All @@ -428,9 +424,9 @@ else if (count == 0)
if (count == 0)
break;

final List<PVAChannel> batch = to_search.subList(start, start + count);
// PVAChannel extends SearchRequest.Channel, so use List<PVAChannel> as Collection<SR.Channel>
search((Collection<SearchRequest.Channel>) (List<? extends SearchRequest.Channel>)batch);
// Submit one batch from 'to_search'
final List<SearchRequest.Channel> batch = to_search.subList(start, start + count);
search(batch);
start += count;
}
}
Expand Down