fix NPE in toString methods fixes taimos#30

hoegertn · hoegertn · commit 75ccbbe80e88 · 2017-07-26T12:05:58.000+02:00
diff --git a/src/main/java/de/taimos/gpsd4java/types/DevicesObject.java b/src/main/java/de/taimos/gpsd4java/types/DevicesObject.java
@@ -84,7 +84,7 @@ public boolean equals(final Object obj) {
 	
 	@Override
 	public String toString() {
-		return "DevicesObject{devices=" + this.devices.size() + "}";
+		return "DevicesObject{devices=" + ((this.devices == null) ? 0 : this.devices.size()) + "}";
 	}
 	
 }
diff --git a/src/main/java/de/taimos/gpsd4java/types/PollObject.java b/src/main/java/de/taimos/gpsd4java/types/PollObject.java
@@ -193,11 +193,11 @@ public String toString() {
 		sb.append(", active=");
 		sb.append(this.active);
 		sb.append(", fixes=");
-		sb.append(this.fixes.size());
+		sb.append(((this.fixes == null) ? 0 : this.fixes.size()));
 		sb.append(", skyviews=");
-		sb.append(this.skyviews.size());
+		sb.append(((this.skyviews == null) ? 0 : this.skyviews.size()));
 		sb.append(", gst=");
-		sb.append(this.gst.size());
+		sb.append(((this.gst == null) ? 0 : this.gst.size()));
 		sb.append("}");
 		
 		return sb.toString();

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public boolean equals(final Object obj) {`
`84`	`84`
`85`	`85`	`@Override`
`86`	`86`	`public String toString() {`
`87`		`- return "DevicesObject{devices=" + this.devices.size() + "}";`
	`87`	`+ return "DevicesObject{devices=" + ((this.devices == null) ? 0 : this.devices.size()) + "}";`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`}`