Skip to content

fix concurrent use of AbstractTextSearchResult.fMatchEvent #992 #2802

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 2 commits into from
Mar 12, 2025
Merged

fix concurrent use of AbstractTextSearchResult.fMatchEvent #992 #2802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62d0a9e
fix concurrent use of AbstractTextSearchResult.fMatchEvent #992
Feb 18, 2025
c6700b2
Version bump(s) for 4.36 stream
eclipse-platform-bot Mar 12, 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
2 changes: 1 addition & 1 deletion bundles/org.eclipse.search/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.search; singleton:=true
Bundle-Version: 3.17.100.qualifier
Bundle-Version: 3.17.200.qualifier
Bundle-Activator: org.eclipse.search.internal.ui.SearchPlugin
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
Expand Down
4 changes: 2 additions & 2 deletions ...les/org.eclipse.search/newsearch/org/eclipse/search/ui/text/AbstractTextSearchResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ public abstract class AbstractTextSearchResult implements ISearchResult {

private final ConcurrentMap<Object, Set<Match>> fElementsToMatches;
private final List<ISearchResultListener> fListeners;
private final MatchEvent fMatchEvent;
private final AtomicInteger matchCount;

private MatchFilter[] fMatchFilters;
Expand All @@ -55,7 +54,6 @@ public abstract class AbstractTextSearchResult implements ISearchResult {
protected AbstractTextSearchResult() {
fElementsToMatches= new ConcurrentHashMap<>();
fListeners= new ArrayList<>();
fMatchEvent= new MatchEvent(this);
matchCount = new AtomicInteger(0);
fMatchFilters= null; // filtering disabled by default
}
Expand Down Expand Up @@ -145,12 +143,14 @@ public void addMatches(Match[] matches) {
}

private MatchEvent getSearchResultEvent(Match match, int eventKind) {
MatchEvent fMatchEvent = new MatchEvent(this);
fMatchEvent.setKind(eventKind);
fMatchEvent.setMatch(match);
return fMatchEvent;
}

private MatchEvent getSearchResultEvent(Collection<Match> matches, int eventKind) {
MatchEvent fMatchEvent = new MatchEvent(this);
fMatchEvent.setKind(eventKind);
Match[] matchArray= matches.toArray(new Match[matches.size()]);
fMatchEvent.setMatches(matchArray);
Expand Down
Loading