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

Merge pull request #1268 from charithag/master

Browse Source 
Fixed NPE in sending push notifications
revert-70aa11f8
Hasunie 6 years ago committed by GitHub
parent 8eaa7c6698 128b5f64aa
commit 6fafde1d16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File

19
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/push/notification/mgt/task/PushNotificationSchedulerTask.java
Unescape View File

@ -86,11 +86,18 @@ public class PushNotificationSchedulerTask implements Runnable {
NotificationStrategy notificationStrategy = provider.getNotificationStrategyByDeviceType NotificationStrategy notificationStrategy = provider.getNotificationStrategyByDeviceType
(operationMapping.getDeviceIdentifier().getType()); (operationMapping.getDeviceIdentifier().getType());
// Send the push notification on given strategy // Send the push notification on given strategy
notificationStrategy.execute(new NotificationContext(operationMapping.getDeviceIdentifier(), if (notificationStrategy != null) {
provider.getOperation(operationMapping.getDeviceIdentifier().getType(), operationMapping notificationStrategy.execute(new NotificationContext(operationMapping.getDeviceIdentifier(),
.getOperationId()))); provider.getOperation(operationMapping.getDeviceIdentifier().getType(), operationMapping
operationMapping.setPushNotificationStatus(Operation.PushNotificationStatus.COMPLETED); .getOperationId())));
operationsCompletedList.add(operationMapping); operationMapping.setPushNotificationStatus(Operation.PushNotificationStatus.COMPLETED);
operationsCompletedList.add(operationMapping);
} else {
if (log.isDebugEnabled()) {
log.debug("Tenant '" + PrivilegedCarbonContext.getThreadLocalCarbonContext()
.getTenantDomain() + "' does not have push notification strategy.");
}
}
} catch (DeviceManagementException e) { } catch (DeviceManagementException e) {
log.error("Error occurred while getting notification strategy for operation mapping " + log.error("Error occurred while getting notification strategy for operation mapping " +
operationMapping.getDeviceIdentifier().getType(), e); operationMapping.getDeviceIdentifier().getType(), e);
@ -121,7 +128,7 @@ public class PushNotificationSchedulerTask implements Runnable {
log.debug("Push notification job running completed."); log.debug("Push notification job running completed.");
} }
} catch (Throwable cause) { } catch (Throwable cause) {
log.error("PushNotificationSchedulerTask failed due to " + cause); log.error("PushNotificationSchedulerTask failed due to " + cause.getMessage(), cause);
} }
} }
} }

Write Preview
Loading…
Cancel
Save