Add support for columns without data types.

psbrandt · Dec 1, 2015 · 270a44b · 270a44b
1 parent 8765e67
commit 270a44b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...src/main/java/org/openmrs/module/reportingrest/web/resource/DataSetMetaDataConverter.java b/...src/main/java/org/openmrs/module/reportingrest/web/resource/DataSetMetaDataConverter.java
@@ -37,7 +37,7 @@ public SimpleObject asRepresentation(DataSetMetaData metadata, Representation re
  Map<String, String> columnMap = new HashMap<String, String>();
  columnMap.put("name", column.getName());
  columnMap.put("label", column.getLabel());
- columnMap.put("datatype", column.getDataType().getName());
+ columnMap.put("datatype", column.getDataType() == null ? "null" : column.getDataType().getName());
  columns.add(columnMap);
  }