From bdce0e72578840f60e05da9f2495804d7ea46ca1 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 10 Mar 2010 07:27:00 +0000
Subject: [PATCH] LMS-1431 bug fixed
SVN: 15092
---
.../client/web/server/resultset/CachedResultSetManager.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
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 f8b1182826c..f53923bc33c 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)
--
GitLab