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

Use an empty AMQP Message body instead of a null value (#1200)

Browse Source
This commit is contained in:
Florian Ruschbaschan
2021-11-03 13:15:47 +01:00
committed by GitHub
parent 3d35ff5aef
commit 7e28fba104
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -367,7 +367,7 @@ public class AmqpMessageDispatcherService extends BaseAmqpService {
return; return;
} }
final Message message = new Message(null, createConnectorMessagePropertiesDeleteThing(tenant, controllerId)); final Message message = new Message("".getBytes(), createConnectorMessagePropertiesDeleteThing(tenant, controllerId));
amqpSenderService.sendMessage(message, URI.create(targetAddress)); amqpSenderService.sendMessage(message, URI.create(targetAddress));
} }
@@ -409,7 +409,7 @@ public class AmqpMessageDispatcherService extends BaseAmqpService {
return; return;
} }
final Message message = new Message(null, final Message message = new Message("".getBytes(),
createConnectorMessagePropertiesEvent(tenant, controllerId, EventTopic.REQUEST_ATTRIBUTES_UPDATE)); createConnectorMessagePropertiesEvent(tenant, controllerId, EventTopic.REQUEST_ATTRIBUTES_UPDATE));
amqpSenderService.sendMessage(message, URI.create(targetAddress)); amqpSenderService.sendMessage(message, URI.create(targetAddress));

2
hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/AbstractAmqpIntegrationTest.java
View File

@@ -66,7 +66,7 @@ public abstract class AbstractAmqpIntegrationTest extends AbstractIntegrationTes
protected Message createMessage(final Object payload, final MessageProperties messageProperties) { protected Message createMessage(final Object payload, final MessageProperties messageProperties) {
if (payload == null) { if (payload == null) {
messageProperties.setContentType(MessageProperties.CONTENT_TYPE_JSON); messageProperties.setContentType(MessageProperties.CONTENT_TYPE_JSON);
return new Message(null, messageProperties); return new Message("".getBytes(), messageProperties);
} }
return getDmfClient().getMessageConverter().toMessage(payload, messageProperties); return getDmfClient().getMessageConverter().toMessage(payload, messageProperties);
} }