thameera
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing issues of previous PRs

Browse Source
revert-dabc3590
mharindu 9 years ago
parent 248f2f8a80
commit 17ad655f7d
5 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File

11
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java
Unescape View File

@ -118,8 +118,8 @@ public class AndroidDeviceManager implements DeviceManager {
JAXBContext context = JAXBContext.newInstance(TenantConfiguration.class); JAXBContext context = JAXBContext.newInstance(TenantConfiguration.class);
Unmarshaller unmarshaller = context.createUnmarshaller(); Unmarshaller unmarshaller = context.createUnmarshaller();
return (TenantConfiguration) unmarshaller.unmarshal( return (TenantConfiguration) unmarshaller.unmarshal(
new StringReader(new String((byte[]) resource.getContent(), Charset new StringReader(new String((byte[]) resource.getContent(), Charset.
.forName(MobilePluginConstants.CHARSET_UTF8)))); forName(MobilePluginConstants.CHARSET_UTF8))));
} }
return new TenantConfiguration(); return new TenantConfiguration();
} catch (MobileDeviceMgtPluginException e) { } catch (MobileDeviceMgtPluginException e) {
@ -288,8 +288,8 @@ public class AndroidDeviceManager implements DeviceManager {
@Override @Override
public License getLicense(String languageCode) throws LicenseManagementException { public License getLicense(String languageCode) throws LicenseManagementException {
return licenseManager return licenseManager.
.getLicense(AndroidDeviceManagementService.DEVICE_TYPE_ANDROID, languageCode); getLicense(AndroidDeviceManagementService.DEVICE_TYPE_ANDROID, languageCode);
} }
@Override @Override
@ -320,8 +320,7 @@ public class AndroidDeviceManager implements DeviceManager {
"updating the details of Android device : " + device.getDeviceIdentifier()); "updating the details of Android device : " + device.getDeviceIdentifier());
} }
AndroidDAOFactory.beginTransaction(); AndroidDAOFactory.beginTransaction();
status = daoFactory.getMobileDeviceDAO() status = daoFactory.getMobileDeviceDAO().updateMobileDevice(existingMobileDevice);
.updateMobileDevice(existingMobileDevice);
AndroidDAOFactory.commitTransaction(); AndroidDAOFactory.commitTransaction();
} catch (MobileDeviceManagementDAOException e) { } catch (MobileDeviceManagementDAOException e) {
try { try {

Write Preview
Loading…
Cancel
Save