From 445659ec5e7fc7442cf34be833df56c20af54418 Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Thu, 31 Mar 2011 09:34:43 +0000
Subject: [PATCH] LMS-2131 Fix NPE.
SVN: 20604
---
.../dss/client/api/gui/DataSetUploadClientModel.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetUploadClientModel.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetUploadClientModel.java
index 8276d768fce..88446664bd5 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetUploadClientModel.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetUploadClientModel.java
@@ -40,6 +40,7 @@ import ch.systemsx.cisd.openbis.generic.shared.api.v1.IGeneralInformationService
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.DataSetType;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.PropertyType;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.PropertyTypeGroup;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode;
import ch.systemsx.cisd.openbis.generic.shared.util.SimplePropertyValidator;
/**
@@ -474,7 +475,11 @@ public class DataSetUploadClientModel
try
{
- simplePropertyValidator.validatePropertyValue(propertyType.getDataType(), valueOrNull);
+ DataTypeCode dataType = propertyType.getDataType();
+ if (simplePropertyValidator.canValidate(dataType))
+ {
+ simplePropertyValidator.validatePropertyValue(dataType, valueOrNull);
+ }
} catch (UserFailureException e)
{
errors.add(ValidationError.createPropertyValidationError(propertyType.getCode(),
--
GitLab