Fixing NPE in AndroidAPIUtils

resolved #616
revert-dabc3590
Hasunie 8 years ago
parent 143569b83b
commit 42cc311f00

@ -209,9 +209,9 @@ public interface ConfigurationMgtService {
@GET @GET
@Path("license") @Path("license")
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN)
@ApiOperation( @ApiOperation(
produces = MediaType.APPLICATION_JSON, produces = MediaType.TEXT_PLAIN,
httpMethod = "GET", httpMethod = "GET",
value = "Getting the License Agreement to Register a Windows Device", value = "Getting the License Agreement to Register a Windows Device",
notes = "Use this REST API to retrieve the license agreement that is used for the Windows device " + notes = "Use this REST API to retrieve the license agreement that is used for the Windows device " +

@ -98,9 +98,10 @@ public class ConfigurationMgtServiceImpl implements ConfigurationMgtService {
* @throws WindowsConfigurationException * @throws WindowsConfigurationException
*/ */
@PUT @PUT
public Response updateConfiguration(PlatformConfiguration configuration) throws WindowsConfigurationException { public Response updateConfiguration(PlatformConfiguration windowsPlatformConfiguration) throws WindowsConfigurationException {
String message; String message;
ConfigurationEntry licenseEntry = null; ConfigurationEntry licenseEntry = null;
PlatformConfiguration configuration = new PlatformConfiguration();
try { try {
configuration.setType(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_WINDOWS); configuration.setType(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_WINDOWS);
List<ConfigurationEntry> configs = configuration.getConfiguration(); List<ConfigurationEntry> configs = configuration.getConfiguration();

Loading…
Cancel
Save