Fix NPE in bigquery XXXInfo.equals

mziccard · mziccard · commit f06c11acea61 · 2016-02-09T16:14:32.000+01:00
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java
@@ -396,7 +396,8 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj.getClass().equals(DatasetInfo.class)
+    return obj != null
+        && obj.getClass().equals(DatasetInfo.class)
         && Objects.equals(toPb(), ((DatasetInfo) obj).toPb());
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
@@ -319,7 +319,9 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj.getClass().equals(JobInfo.class) && Objects.equals(toPb(), ((JobInfo) obj).toPb());
+    return obj != null
+        && obj.getClass().equals(JobInfo.class)
+        && Objects.equals(toPb(), ((JobInfo) obj).toPb());
   }
 
   JobInfo setProjectId(String projectId) {
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
@@ -339,7 +339,8 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj.getClass().equals(TableInfo.class)
+    return obj != null
+        && obj.getClass().equals(TableInfo.class)
         && Objects.equals(toPb(), ((TableInfo) obj).toPb());
   }
 

Original file line number	Diff line number	Diff line change
`@@ -396,7 +396,8 @@ public int hashCode() {`
`396`	`396`
`397`	`397`	`@Override`
`398`	`398`	`public boolean equals(Object obj) {`
`399`		`- return obj.getClass().equals(DatasetInfo.class)`
	`399`	`+ return obj != null`
	`400`	`+ && obj.getClass().equals(DatasetInfo.class)`
`400`	`401`	`&& Objects.equals(toPb(), ((DatasetInfo) obj).toPb());`
`401`	`402`	`}`
`402`	`403`
Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,9 @@ public int hashCode() {`
`319`	`319`
`320`	`320`	`@Override`
`321`	`321`	`public boolean equals(Object obj) {`
`322`		`- return obj.getClass().equals(JobInfo.class) && Objects.equals(toPb(), ((JobInfo) obj).toPb());`
	`322`	`+ return obj != null`
	`323`	`+ && obj.getClass().equals(JobInfo.class)`
	`324`	`+ && Objects.equals(toPb(), ((JobInfo) obj).toPb());`
`323`	`325`	`}`
`324`	`326`
`325`	`327`	`JobInfo setProjectId(String projectId) {`
Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,8 @@ public int hashCode() {`
`339`	`339`
`340`	`340`	`@Override`
`341`	`341`	`public boolean equals(Object obj) {`
`342`		`- return obj.getClass().equals(TableInfo.class)`
	`342`	`+ return obj != null`
	`343`	`+ && obj.getClass().equals(TableInfo.class)`
`343`	`344`	`&& Objects.equals(toPb(), ((TableInfo) obj).toPb());`
`344`	`345`	`}`
`345`	`346`