Remove possibility of a typed nil

zvelo · May 19, 2016 · d8c91f6 · d8c91f6
1 parent 2aca30a
commit d8c91f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/dataset.go b/dataset.go
@@ -40,6 +40,9 @@ func (m *DataSet) FieldByType(dsType DataSetType) (interface{}, error) {
 
 	switch dsType {
 	case DataSetType_KEYWORD, DataSetType_SENTIMENT:
+		if m.Keyword == nil {
+			return nil, nil
+		}
 		return m.Keyword, nil
 	}
 

diff --git a/dataset_test.go b/dataset_test.go
@@ -21,7 +21,7 @@ func testDS(t *testing.T, ds *DataSet, expectNil bool) {
 		}
 
 		if i != nil && expectNil {
-			t.Errorf("got unexpected nil dataset field %v", i)
+			t.Errorf("got unexpected nil dataset field %#v", i)
 		}
 
 		if expectNil {