Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove remaining Reactor event wrapping

Browse Source
This commit is contained in:
Rossen Stoyanchev
2013-06-10 13:59:19 -04:00
parent 84c55f90db
commit 547167e8b4
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-websocket/src/main/java/org/springframework/web/messaging/service/PubSubMessageService.java
View File

@@ -31,8 +31,6 @@ import org.springframework.web.messaging.event.EventBus;
import org.springframework.web.messaging.event.EventConsumer;
import org.springframework.web.messaging.event.EventRegistration;
import reactor.fn.Event;
/**
* @author Rossen Stoyanchev
@@ -74,7 +72,7 @@ public class PubSubMessageService extends AbstractMessageService {
byte[] payload = payloadConverter.convertToPayload(message.getPayload(), contentType);
message = new GenericMessage<byte[]>(payload, headers);
getEventBus().send(getPublishKey(message), Event.wrap(message));
getEventBus().send(getPublishKey(message), message);
}
catch (Exception ex) {
logger.error("Failed to publish " + message, ex);

3
spring-websocket/src/main/java/org/springframework/web/messaging/stomp/support/RelayStompService.java
View File

@@ -40,7 +40,6 @@ import org.springframework.web.messaging.stomp.StompCommand;
import org.springframework.web.messaging.stomp.StompHeaders;
import org.springframework.web.messaging.stomp.StompMessage;
import reactor.fn.Event;
import reactor.util.Assert;
@@ -243,7 +242,7 @@ public class RelayStompService extends AbstractMessageService {
StompHeaders headers = new StompHeaders();
headers.setMessage(message);
StompMessage errorMessage = new StompMessage(StompCommand.ERROR, headers);
getEventBus().send(this.replyTo, Event.wrap(errorMessage));
getEventBus().send(this.replyTo, errorMessage);
}
}