SSDM-13524: Fixed create and update material executors

server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialTypesOperationExecutor.java

@@ -90,7 +90,7 @@ public class CreateMaterialTypesOperationExecutor
                     PropertyTypePE type =
                             findPropertyType(context,
                                     propertyAssignmentCreation.getPropertyTypeId());
-                    if (type.getType() != null && INVALID_TYPES.contains(type.getType().getCode()))
+                    if (type != null && type.getType() != null && INVALID_TYPES.contains(type.getType().getCode()))
                     {
                         return false;
                     }
@@ -106,11 +106,6 @@ public class CreateMaterialTypesOperationExecutor
         Map<IPropertyTypeId, PropertyTypePE> propertyTypePEMap =
                 mapPropertyTypeByIdExecutor.map(context, Arrays.asList(propertyTypeId));
         PropertyTypePE propertyTypePE = propertyTypePEMap.get(propertyTypeId);
-
-        if (propertyTypePE == null)
-        {
-            throw new ObjectNotFoundException(propertyTypeId);
-        }
         return propertyTypePE;
     }
 

server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialTypesOperationExecutor.java

@@ -92,7 +92,7 @@ public class UpdateMaterialTypesOperationExecutor
                     {
                         PropertyTypePE type =
                                 findPropertyType(context, addedAssignments.getPropertyTypeId());
-                        if (type.getType() != null && INVALID_TYPES.contains(
+                        if (type != null && type.getType() != null && INVALID_TYPES.contains(
                                 type.getType().getCode()))
                         {
                             return false;
@@ -106,7 +106,7 @@ public class UpdateMaterialTypesOperationExecutor
                     {
                         PropertyTypePE type =
                                 findPropertyType(context, setAssignments.getPropertyTypeId());
-                        if (type.getType() != null && INVALID_TYPES.contains(
+                        if (type != null && type.getType() != null && INVALID_TYPES.contains(
                                 type.getType().getCode()))
                         {
                             return false;
@@ -124,11 +124,6 @@ public class UpdateMaterialTypesOperationExecutor
         Map<IPropertyTypeId, PropertyTypePE> propertyTypePEMap =
                 mapPropertyTypeByIdExecutor.map(context, Arrays.asList(propertyTypeId));
         PropertyTypePE propertyTypePE = propertyTypePEMap.get(propertyTypeId);
-
-        if (propertyTypePE == null)
-        {
-            throw new ObjectNotFoundException(propertyTypeId);
-        }
         return propertyTypePE;
     }