Merge pull request #490 from marek22k/issue-489

angryziber · web-flow · commit 3ff7e9d43b5e · 2025-11-10T18:08:37.000+02:00
Allow access to PingResult::merge outside the package
diff --git a/CHANGELOG b/CHANGELOG
@@ -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
diff --git a/src/net/azib/ipscan/core/net/PingResult.java b/src/net/azib/ipscan/core/net/PingResult.java
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public boolean isTimeoutAdaptationAllowed() {`
`87`	`87`	`return timeoutAdaptationAllowed;`
`88`	`88`	`}`
`89`	`89`
`90`		`- PingResult merge(PingResult result) {`
	`90`	`+ public PingResult merge(PingResult result) {`
`91`	`91`	`this.packetCount += result.packetCount;`
`92`	`92`	`this.replyCount += result.replyCount;`
`93`	`93`	`return this;`