diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManager.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManager.java index f8b1182826cb882b917112fb95916ab8f847a2d3..f53923bc33cb31f66e96fdfe564dcf2cb8d2c0e3 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManager.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManager.java @@ -363,7 +363,11 @@ public final class CachedResultSetManager<K> implements IResultSetManager<K>, Se private <T> Set<String> gatherAllColumnIDs(final IResultSetConfig<K, T> resultConfig) { Set<String> ids = new HashSet<String>(); - ids.addAll(resultConfig.getIDsOfPresentedColumns()); + Set<String> idsOfPresentedColumns = resultConfig.getIDsOfPresentedColumns(); + if (idsOfPresentedColumns != null) + { + ids.addAll(idsOfPresentedColumns); + } GridFilters<T> filters = resultConfig.getFilters(); List<GridColumnFilterInfo<T>> filterInfos = filters.tryGetFilterInfos(); if (filterInfos != null)