Commit be1fc2e16a8f4ccdc8a8fdff63ff5641a3f5b845
Merge branch 'master' of https://github.com/thingsboard/thingsboard
Showing
100 changed files
with
101 additions
and
101 deletions
Too many changes to show.
To preserve performance only 100 of 2868 files are displayed.
| 1 | 1 | <?xml version="1.0" encoding="UTF-8" ?> |
| 2 | 2 | <!-- |
| 3 | 3 | |
| 4 | - Copyright © 2016-2020 The Thingsboard Authors | |
| 4 | + Copyright © 2016-2021 The Thingsboard Authors | |
| 5 | 5 | |
| 6 | 6 | Licensed under the Apache License, Version 2.0 (the "License"); |
| 7 | 7 | you may not use this file except in compliance with the License. | ... | ... |
| 1 | 1 | /** |
| 2 | - * Copyright © 2016-2020 The Thingsboard Authors | |
| 2 | + * Copyright © 2016-2021 The Thingsboard Authors | |
| 3 | 3 | * |
| 4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | 5 | * you may not use this file except in compliance with the License. |
| ... | ... | @@ -151,7 +151,7 @@ public class DeviceProfileController extends BaseController { |
| 151 | 151 | |
| 152 | 152 | logEntityAction(savedDeviceProfile.getId(), savedDeviceProfile, |
| 153 | 153 | null, |
| 154 | - savedDeviceProfile.getId() == null ? ActionType.ADDED : ActionType.UPDATED, null); | |
| 154 | + created ? ActionType.ADDED : ActionType.UPDATED, null); | |
| 155 | 155 | |
| 156 | 156 | return savedDeviceProfile; |
| 157 | 157 | } catch (Exception e) { | ... | ... |