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

Merge pull request #111 from bsinno/BUG/Exception_When_Try_to_Extract_Amqp_Uri

Browse Source 
Before sending a message check if the uri is a amqp uri.
This commit is contained in:
Kai Zimmermann
2016-03-31 14:06:06 +02:00
parent 00c86ebddb 26466c7d6a
commit ddc1f7059f
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,10 +24,10 @@ public interface AmqpSenderService {
* *
* @param message * @param message
* the amqp message * the amqp message
* @param uri * @param replyTo
* the reply to uri * the reply to uri
*/ */
void sendMessage(Message message, URI uri); void sendMessage(Message message, URI replyTo);
/** /**
* Extract the exchange from the uri. Default implementation removes the * Extract the exchange from the uri. Default implementation removes the

9
hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DefaultAmqpSenderService.java
View File

@@ -10,6 +10,7 @@ package org.eclipse.hawkbit.amqp;
import java.net.URI; import java.net.URI;
import org.eclipse.hawkbit.util.IpUtil;
import org.springframework.amqp.core.Message; import org.springframework.amqp.core.Message;
import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -33,8 +34,12 @@ public class DefaultAmqpSenderService implements AmqpSenderService {
} }
@Override @Override
public void sendMessage(final Message message, final URI uri) { public void sendMessage(final Message message, final URI replyTo) {
internalAmqpTemplate.send(extractExchange(uri), null, message); if (!IpUtil.isAmqpUri(replyTo)) {
return;
}
internalAmqpTemplate.send(extractExchange(replyTo), null, message);
} }
} }