From 8eea5deaf45ebe07757a453913cf944cc07eb96e Mon Sep 17 00:00:00 2001
From: gpawel <gpawel>
Date: Wed, 21 Mar 2012 15:53:56 +0000
Subject: [PATCH] bugfix: cancel button works now in the sample chooser dialog

SVN: 24767
---
 .../web/client/application/ui/field/SampleChooserButton.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/SampleChooserButton.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/SampleChooserButton.java
index 7e6f4ba0440..2e983c96efc 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/SampleChooserButton.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/SampleChooserButton.java
@@ -152,6 +152,11 @@ public class SampleChooserButton extends Button implements
 
     public void setChosenEntities(List<TableModelRowWithObject<Sample>> entities)
     {
+        if (entities == null)
+        {
+            return;
+        }
+
         CommaSeparatedListBuilder builder = new CommaSeparatedListBuilder();
         for (TableModelRowWithObject<Sample> row : entities)
         {
-- 
GitLab