Skip to content

Allow access to PingResult::merge outside the package #490

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
angryziber merged 2 commits into from
Nov 10, 2025
Merged

Allow access to PingResult::merge outside the package #490

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
9843ce5
Allow access to PingResult::merge outside the package
marek22k Oct 31, 2025
a5d28f5
Merge branch 'master' into issue-489
angryziber Nov 10, 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
1 change: 1 addition & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Changes in 3.9.3:
- Switch from the legacy Date API to Java's new Time API
- Time is now specified in 24-hour format in XML export
- Enable exporting very long lines as .txt
- Allow plugins to merge multiple ping results

Changes in 3.9.2:
- Linux: specify Java 17 as minimum required version in .deb and .rpm packages
Expand Down
2 changes: 1 addition & 1 deletion src/net/azib/ipscan/core/net/PingResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public boolean isTimeoutAdaptationAllowed() {
return timeoutAdaptationAllowed;
}

PingResult merge(PingResult result) {
public PingResult merge(PingResult result) {
this.packetCount += result.packetCount;
this.replyCount += result.replyCount;
return this;
Expand Down
Loading