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

Switch back to Reactor 3.0 snapshots

Browse Source
This commit is contained in:
Rossen Stoyanchev
2016-08-08 15:52:16 -04:00
parent 526ce28ef0
commit cc288a0c4a
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle
View File

@@ -74,8 +74,8 @@ configure(allprojects) { project ->
ext.protobufVersion = "3.0.0" ext.protobufVersion = "3.0.0"
ext.reactivestreamsVersion = "1.0.0" ext.reactivestreamsVersion = "1.0.0"
ext.reactorVersion = "2.0.8.RELEASE" ext.reactorVersion = "2.0.8.RELEASE"
ext.reactorCoreVersion = '3.0.0.RC1' ext.reactorCoreVersion = '3.0.0.BUILD-SNAPSHOT'
ext.reactorNettyVersion = '0.5.0.M2' ext.reactorNettyVersion = '0.5.0.BUILD-SNAPSHOT'
ext.romeVersion = "1.6.0" ext.romeVersion = "1.6.0"
ext.rxjavaVersion = '1.1.8' ext.rxjavaVersion = '1.1.8'
ext.rxnettyVersion = '0.5.2-rc.3' ext.rxnettyVersion = '0.5.2-rc.3'
@@ -160,6 +160,7 @@ configure(allprojects) { project ->
repositories { repositories {
maven { url "https://repo.spring.io/libs-release" } maven { url "https://repo.spring.io/libs-release" }
maven { url "https://repo.spring.io/milestone" } maven { url "https://repo.spring.io/milestone" }
maven { url "https://repo.spring.io/snapshot" } // Reactor 3 snapshots
} }
dependencies { dependencies {

2
spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
View File

@@ -184,7 +184,7 @@ public abstract class DataBufferUtils {
} }
} }
catch (IOException ex) { catch (IOException ex) {
sub.fail(ex); sub.error(ex);
} }
return channel; return channel;
} }

5
spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java
View File

@@ -138,8 +138,9 @@ public class InvocableHandlerMethod extends HandlerMethod {
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
return Mono.when(monos).log("reactor.unresolved").map(args -> // Create Mono with array of resolved values...
Stream.of(args).map(o -> o != NO_VALUE ? o : null).toArray()); return Mono.when(monos,
args -> Stream.of(args).map(o -> o != NO_VALUE ? o : null).toArray());
} }
catch (Throwable ex) { catch (Throwable ex) {
return Mono.error(ex); return Mono.error(ex);

2
spring-web/src/test/java/org/springframework/http/server/reactive/ChannelSendOperatorTests.java
View File

@@ -114,7 +114,7 @@ public class ChannelSendOperatorTests {
int i = ++idx; int i = ++idx;
subscriber.next(String.valueOf(i)); subscriber.next(String.valueOf(i));
if (i == 3) { if (i == 3) {
subscriber.fail(error); subscriber.error(error);
} }
return i; return i;
}); });