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

Fix: PDCIStatistics#merge should ignore null input

See merge request genesys-pgr/genesys-server!231

src/main/java/org/genesys2/server/model/genesys/PDCIStatistics.java

@@ -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;
 	}
 }