Merge pull request #7707 from thingsboard/bug/6008
Bug 6008: OTA image assigned to device profile does not populate device shared properties
This commit is contained in:
		
						commit
						e8c5a71a16
					
				@ -181,10 +181,11 @@ public class DefaultOtaPackageStateService implements OtaPackageStateService {
 | 
			
		||||
 | 
			
		||||
    private void update(TenantId tenantId, DeviceProfile deviceProfile, OtaPackageType otaPackageType) {
 | 
			
		||||
        Consumer<Device> updateConsumer;
 | 
			
		||||
        OtaPackageId packageId = OtaPackageUtil.getOtaPackageId(deviceProfile, otaPackageType);
 | 
			
		||||
 | 
			
		||||
        if (deviceProfile.getFirmwareId() != null) {
 | 
			
		||||
        if (packageId != null) {
 | 
			
		||||
            long ts = System.currentTimeMillis();
 | 
			
		||||
            updateConsumer = d -> send(d.getTenantId(), d.getId(), deviceProfile.getFirmwareId(), ts, otaPackageType);
 | 
			
		||||
            updateConsumer = d -> send(d.getTenantId(), d.getId(), packageId, ts, otaPackageType);
 | 
			
		||||
        } else {
 | 
			
		||||
            updateConsumer = d -> remove(d, otaPackageType);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user