Skip to content

fix for: api (and other things) possibly returning duplicate MediaAssets #1403

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
naknomum merged 4 commits into from
May 8, 2026
+6 −6
Merged

fix for: api (and other things) possibly returning duplicate MediaAssets #1403

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d58e304
forever now enc.getMedia() could be return duplicates. how silly.
naknomum Jan 26, 2026
f9f70f2
Merge branch 'main' into fix_for_encounter_api_duplicate_assets
naknomum Apr 15, 2026
ded0c72
test fix: enc.getMedia() no longer gives duplicate assets so this tes…
naknomum Apr 15, 2026
0f0ba66
Merge branch 'main' into fix_for_encounter_api_duplicate_assets
naknomum May 8, 2026
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 src/main/java/org/ecocean/Encounter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3003,7 +3003,7 @@ public ArrayList<MediaAsset> getMedia() {
for (Annotation ann : annotations) {
if (ann == null) continue; // really weird that this happens sometimes
MediaAsset ma = ann.getMediaAsset();
if (ma != null) m.add(ma);
if ((ma != null) && !m.contains(ma)) m.add(ma);
}
return m;
}
Expand Down
Loading