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

Merge pull request #116 from bsinno/fix-wrong-ui-call

Browse Source 
Fixed wrong call of sw module type. UI uses name and not key.
This commit is contained in:
Michael Hirsch
2016-04-01 16:40:35 +02:00
parent 13c38c1134 0a0c08b700
commit 861c92cb9d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,7 +259,7 @@ public class SoftwareManagement {
} }
/** /**
* retrieves {@link SoftwareModule}s by their name AND version. * retrieves {@link SoftwareModule} by their name AND version AND type..
* *
* @param name * @param name
* of the {@link SoftwareModule} * of the {@link SoftwareModule}

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java
View File

@@ -809,7 +809,7 @@ public final class HawkbitCommonUtil {
public static boolean isDuplicate(final String name, final String version, final String type) { public static boolean isDuplicate(final String name, final String version, final String type) {
final SoftwareManagement swMgmtService = SpringContextHelper.getBean(SoftwareManagement.class); final SoftwareManagement swMgmtService = SpringContextHelper.getBean(SoftwareManagement.class);
final SoftwareModule swModule = swMgmtService.findSoftwareModuleByNameAndVersion(name, version, final SoftwareModule swModule = swMgmtService.findSoftwareModuleByNameAndVersion(name, version,
swMgmtService.findSoftwareModuleTypeByKey(type)); swMgmtService.findSoftwareModuleTypeByName(type));
boolean duplicate = false; boolean duplicate = false;
if (swModule != null) { if (swModule != null) {
duplicate = true; duplicate = true;