Skip to content

Commit a2e70d2

Browse files
committed
Move back to SNAPSHOTs; fix for Reactor changes
1 parent f45206a commit a2e70d2

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,20 +90,20 @@ ext {
9090
pahoMqttClientVersion = '1.2.4'
9191
postgresVersion = '42.2.14'
9292
r2dbch2Version='0.8.4.RELEASE'
93-
reactorVersion = '2020.0.0-M2'
93+
reactorVersion = '2020.0.0-SNAPSHOT'
9494
resilience4jVersion = '1.5.0'
9595
romeToolsVersion = '1.12.2'
9696
rsocketVersion = '1.1.0-M1'
9797
saajVersion = '1.5.2'
9898
servletApiVersion = '4.0.1'
9999
smackVersion = '4.3.4'
100100
soapVersion = '1.4.0'
101-
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.3.0-M2'
102-
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2020.0.0-M2'
103-
springKafkaVersion = '2.6.0-M1'
101+
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.3.0-SNAPSHOT'
102+
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2020.0.0-SNAPSHOT'
103+
springKafkaVersion = '2.6.0-SNAPSHOT'
104104
springRetryVersion = '1.3.0'
105105
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '5.4.0-RC1'
106-
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.0-M2'
106+
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.0-SNAPSHOT'
107107
springWsVersion = '3.0.9.RELEASE'
108108
tomcatVersion = "9.0.37"
109109
xstreamVersion = '1.4.12'

spring-integration-core/src/main/java/org/springframework/integration/channel/FluxMessageChannel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public FluxMessageChannel() {
5959
protected boolean doSend(Message<?> message, long timeout) {
6060
Assert.state(this.processor.hasDownstreams(),
6161
() -> "The [" + this + "] doesn't have subscribers to accept messages");
62-
return this.sink.emitNext(message).hasEmitted();
62+
return this.sink.tryEmitNext(message).hasSucceeded();
6363
}
6464

6565
@Override

spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ private static class MonoReplyChannel implements MessageChannel, ReactiveStreams
894894

895895
@Override
896896
public boolean send(Message<?> message, long timeout) {
897-
return Boolean.TRUE.equals(this.replyMono.emitValue(message).hasEmitted());
897+
return this.replyMono.tryEmitValue(message).hasSucceeded();
898898
}
899899

900900
@Override

spring-integration-core/src/main/java/org/springframework/integration/util/IntegrationReactiveUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ private static <T> Flux<Message<T>> adaptSubscribableChannelToPublisher(Subscrib
129129
Sinks.Many<Message<T>> sink = Sinks.many().multicast().onBackpressureBuffer(1);
130130
@SuppressWarnings("unchecked")
131131
MessageHandler messageHandler = (message) -> {
132-
while (!sink.emitNext((Message<T>) message).hasEmitted()) {
132+
while (!sink.tryEmitNext((Message<T>) message).hasSucceeded()) {
133133
LockSupport.parkNanos(100); // NOSONAR
134134
}
135135
};

0 commit comments

Comments
 (0)