community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix server startup issues

Browse Source
This commit is contained in:
tcdlpds@gmail.com 2021-02-10 09:24:38 +05:30
parent 175205b959
commit 572e93a357
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/DeviceTypeManager.java
View File

@ -123,9 +123,15 @@ public class DeviceTypeManager implements DeviceManager {
//add license to registry. //add license to registry.
this.licenseManager = new MetaRepositoryBasedLicenseManager(); this.licenseManager = new MetaRepositoryBasedLicenseManager();
try { try {
licenseManager.getLicense(deviceType, DeviceTypePluginConstants.LANGUAGE_CODE_ENGLISH_US); if (deviceTypeConfiguration.getLicense() != null) {
License defaultLicense = new License();
defaultLicense.setLanguage(deviceTypeConfiguration.getLicense().getLanguage());
defaultLicense.setVersion(deviceTypeConfiguration.getLicense().getVersion());
defaultLicense.setText(deviceTypeConfiguration.getLicense().getText());
licenseManager.addLicense(deviceType, defaultLicense);
}
} catch (LicenseManagementException e) { } catch (LicenseManagementException e) {
String msg = "Error occurred while loading license of device type: " + deviceType; String msg = "Error occurred while adding default license of device type: " + deviceType;
throw new DeviceTypeDeployerPayloadException(msg, e); throw new DeviceTypeDeployerPayloadException(msg, e);
} }

1
components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/license/mgt/meta/data/MetaRepositoryBasedLicenseManager.java
View File

@ -117,6 +117,5 @@ public class MetaRepositoryBasedLicenseManager implements LicenseManager {
log.error(msg, e); log.error(msg, e);
throw new LicenseManagementException(msg, e); throw new LicenseManagementException(msg, e);
} }
} }
} }