Commit 415f0728 authored by Matija Obreza's avatar Matija Obreza
Browse files

Merge branch 'bug-org-cogent' into 'master'

Fix: PDCIStatistics#merge should ignore null input

See merge request genesys-pgr/genesys-server!231
parents 898cb7e0 14bc04c0
......@@ -144,11 +144,12 @@ public class PDCIStatistics implements Serializable {
}
public PDCIStatistics merge(PDCIStatistics other) {
updateMin(other.getMin());
updateMax(other.getMax());
updateCountAndAvg(other.getCount(), other.getAvg());
updateHistogram(other.getHistogram());
if (other != null) {
updateMin(other.getMin());
updateMax(other.getMax());
updateCountAndAvg(other.getCount(), other.getAvg());
updateHistogram(other.getHistogram());
}
return this;
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment