From 0a87acb22325d5fedbfcc261bad584fb819649b9 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Thu, 15 Dec 2016 13:37:29 +0000
Subject: [PATCH] SSDM-4187: Fix bug in
GenericSampleEditForm.updateProjectField()
SVN: 37510
---
.../web/client/application/sample/GenericSampleEditForm.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.java
index 59214b6ae40..7d563c77d5d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.java
@@ -163,7 +163,10 @@ public final class GenericSampleEditForm extends AbstractGenericSampleRegisterEd
if (projectSamplesEnabled)
{
Project project = originalSample.getProject();
- projectChooser.selectProjectAndUpdateOriginal(project.getIdentifier());
+ if (project != null)
+ {
+ projectChooser.selectProjectAndUpdateOriginal(project.getIdentifier());
+ }
}
}
--
GitLab