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

Fix DMF update cancel message (#397)

Browse Source 
* Fix bug where DMF sends cancel for DDI targets.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix nullpointer when event consumer access target info.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
This commit is contained in:
Kai Zimmermann
2016-12-22 09:29:07 +01:00
committed by GitHub
parent e6f702c882
commit eb9fd0fea7
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherService.java
View File

@@ -156,6 +156,10 @@ public class AmqpMessageDispatcherService extends BaseAmqpService {
void sendCancelMessageToTarget(final String tenant, final String controllerId, final Long actionId, void sendCancelMessageToTarget(final String tenant, final String controllerId, final Long actionId,
final URI address) { final URI address) {
if (!IpUtil.isAmqpUri(address)) {
return;
}
final Message message = getMessageConverter().toMessage(actionId, final Message message = getMessageConverter().toMessage(actionId,
createConnectorMessageProperties(tenant, controllerId, EventTopic.CANCEL_DOWNLOAD)); createConnectorMessageProperties(tenant, controllerId, EventTopic.CANCEL_DOWNLOAD));

5
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDeploymentManagement.java
View File

@@ -409,10 +409,15 @@ public class JpaDeploymentManagement implements DeploymentManagement {
* the action id of the assignment * the action id of the assignment
*/ */
private void cancelAssignDistributionSetEvent(final Target target, final Long actionId) { private void cancelAssignDistributionSetEvent(final Target target, final Long actionId) {
loadLazyTargetInfo(target);
afterCommit.afterCommit(() -> eventPublisher afterCommit.afterCommit(() -> eventPublisher
.publishEvent(new CancelTargetAssignmentEvent(target, actionId, applicationContext.getId()))); .publishEvent(new CancelTargetAssignmentEvent(target, actionId, applicationContext.getId())));
} }
private static void loadLazyTargetInfo(final Target target) {
target.getTargetInfo();
}
@Override @Override
@Modifying @Modifying
@Transactional(isolation = Isolation.READ_COMMITTED) @Transactional(isolation = Isolation.READ_COMMITTED)