From 8d246932865458e4f8faa18dba48f2063768fe94 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 18 Jun 2014 07:58:59 +0000
Subject: [PATCH] SSDM-387: handle case if getProperties() returns null

SVN: 31732
---
 .../cisd/openbis/dss/generic/server/MetaDataBuilder.java      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/MetaDataBuilder.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/MetaDataBuilder.java
index 0c44aa65a52..fc8934a5f12 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/MetaDataBuilder.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/MetaDataBuilder.java
@@ -173,6 +173,10 @@ public class MetaDataBuilder
 
     private void addProperties(String category, List<IEntityProperty> properties)
     {
+        if (properties == null)
+        {
+            return;
+        }
         Collections.sort(properties, PROPERTIES_COMPARATOR);
         for (IEntityProperty property : properties)
         {
-- 
GitLab