Merge branch 'master' into bug5264

This commit is contained in:
Axel Uhl committed 2020-04-29 20:29:35 +02:00
commit f7f88a685f
1 file changed
+3 -1
@@ -123,7 +123,9 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
try {
final Document deviceIdDocument = dbObject.get(FieldNames.MARK_PROPERTIES_TRACKING_DEVICE_IDENTIFIER.name(), Document.class);
final DeviceIdentifier deviceIdentifier = deviceIdDocument == null ? null : loadDeviceId(deviceIdentifierServiceFinder, deviceIdDocument);
builder.withDeviceId(deviceIdentifier);
if (deviceIdentifier != null) {
builder.withDeviceId(deviceIdentifier);
}
} catch (TransformationException | NoCorrespondingServiceRegisteredException e) {
logger.log(Level.WARNING, "Could not load deviceId for MarkProperties", e);
}