lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

fixed conditions evaluations, that always resulted in true (#844)

Browse Source 
Signed-off-by: Bogdan Bondar <Bogdan.Bondar@bosch-si.com>
This commit is contained in:
Bondar Bogdan
2019-05-23 09:12:42 +02:00
committed by Dominic Schabel
parent 314c74468a
commit d5c373e420
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSystemManagement.java
View File

@@ -340,7 +340,7 @@ public class JpaSystemManagement implements CurrentTenantCacheKeyGenerator, Syst
} }
return null; return null;
})); }));
} while (tenants.hasNext() && (query = tenants.nextPageable()) != null); } while ((query = tenants.nextPageable()) != Pageable.unpaged());
} }
} }

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/DistributionSetMetadataDetailsLayout.java
View File

@@ -66,7 +66,7 @@ public class DistributionSetMetadataDetailsLayout extends AbstractMetadataDetail
selectedDistSetId = distributionSet.getId(); selectedDistSetId = distributionSet.getId();
final List<DistributionSetMetadata> dsMetadataList = distributionSetManagement final List<DistributionSetMetadata> dsMetadataList = distributionSetManagement
.findMetaDataByDistributionSetId(PageRequest.of(0, MAX_METADATA_QUERY), selectedDistSetId).getContent(); .findMetaDataByDistributionSetId(PageRequest.of(0, MAX_METADATA_QUERY), selectedDistSetId).getContent();
if (null != dsMetadataList && !dsMetadataList.isEmpty()) { if (!dsMetadataList.isEmpty()) {
dsMetadataList.forEach(this::setMetadataProperties); dsMetadataList.forEach(this::setMetadataProperties);
} }
} }

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/TargetMetadataDetailsLayout.java
View File

@@ -66,7 +66,7 @@ public class TargetMetadataDetailsLayout extends AbstractMetadataDetailsLayout {
final List<TargetMetadata> targetMetadataList = targetManagement final List<TargetMetadata> targetMetadataList = targetManagement
.findMetaDataByControllerId(PageRequest.of(0, MAX_METADATA_QUERY), target.getControllerId()) .findMetaDataByControllerId(PageRequest.of(0, MAX_METADATA_QUERY), target.getControllerId())
.getContent(); .getContent();
if (targetMetadataList != null && !targetMetadataList.isEmpty()) { if (!targetMetadataList.isEmpty()) {
targetMetadataList.forEach(this::setMetadataProperties); targetMetadataList.forEach(this::setMetadataProperties);
} }
} }