bugfix synch property definitions

forTEXT · Jun 18, 2018 · f2d5132 · f2d5132
1 parent 273caa7
commit f2d5132
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/de/catma/repository/db/UserMarkupCollectionHandler.java b/src/de/catma/repository/db/UserMarkupCollectionHandler.java
@@ -42,6 +42,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
 
 import javax.sql.DataSource;
 
@@ -926,12 +927,11 @@ void updateTagsetDefinitionInUserMarkupCollections(
 				for (TagInstance ti : relevantTagInstances) {
 					// get all valid propertyDef IDs
 					Collection<Integer> relevantUserDefPropertyDefIds = 
-							Collections2.transform(ti.getUserDefinedProperties(),
-									new Function<Property, Integer>() {
-								public Integer apply(
-										Property property) {
-									return property.getPropertyDefinition().getId();
-								}});
+							ti.getUserDefinedProperties()
+							.stream()
+							.map(property -> property.getPropertyDefinition().getId())
+							.filter(id -> id != null) // maybe null because of newly added propertydefinitions
+							.collect(Collectors.toSet());
 					relevantUserDefPropertyIdList.addAll(relevantUserDefPropertyDefIds);
 
 					byte[] tagInstanceUUIDbin =