From 98cc7556e88db15305a9410330a2cad1faaa4479 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 22 Mar 2011 10:19:58 +0000
Subject: [PATCH] LMS-2146 bug fixed

SVN: 20441
---
 .../openbis/generic/shared/basic/dto/DisplaySettings.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DisplaySettings.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DisplaySettings.java
index abf8f587334..a88987a41d5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DisplaySettings.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DisplaySettings.java
@@ -70,7 +70,7 @@ public class DisplaySettings implements ISerializable
 
     private Map<String, Integer> panelSizeSettings = new HashMap<String, Integer>();
     
-    private List<EntityVisit> visits = new ArrayList<EntityVisit>();
+    private List<EntityVisit> visits;
 
     /** @deprecated Should be used only by DisplaySettingsManager. */
     @Deprecated
@@ -262,13 +262,17 @@ public class DisplaySettings implements ISerializable
     @Deprecated
     public void addEntityVisit(EntityVisit entityVisit)
     {
-        visits.add(entityVisit);
+        getVisits().add(entityVisit);
     }
     
     /** @deprecated Should be used only by DisplaySettingsManager. */
     @Deprecated
     public List<EntityVisit> getVisits()
     {
+        if (visits == null)
+        {
+            visits = new ArrayList<EntityVisit>();
+        }
         return visits;
     }
 
-- 
GitLab