diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DefaultResultSetConfig.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DefaultResultSetConfig.java index b562ed929b630f0ba8d53bae3dd7806cb9e91f41..ec9f3f428714772af9a459904753d96b7490a6e0 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DefaultResultSetConfig.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DefaultResultSetConfig.java @@ -46,7 +46,7 @@ public class DefaultResultSetConfig<K, T> implements IResultSetConfig<K, T>, IsS private Set<IColumnDefinition<T>> availableColumns; - private GridFilters<T> filters; + private GridFilters<T> filters = GridFilters.createEmptyFilter(); // null if no custom columns are needed private String gridDisplayIdOrNull; diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.java index d81deeb44254f570375ca0f6b6a28e5e5b7b686c..950b03dfe8264615c0b3486ae6c9ad1a824bb9f3 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.java @@ -381,9 +381,10 @@ public final class CommonClientServiceTest extends AbstractClientServiceTest } }); + DefaultResultSetConfig<String, ExternalData> resultSetConfig = + DefaultResultSetConfig.createFetchAll(); ResultSetWithEntityTypes<ExternalData> resultSet = - commonClientService.listExperimentDataSets(experimentId, - new DefaultResultSetConfig<String, ExternalData>()); + commonClientService.listExperimentDataSets(experimentId, resultSetConfig); List<ExternalData> list = resultSet.getResultSet().getList().extractOriginalObjects(); assertEquals(1, list.size()); ExternalData data = list.get(0);