Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
20742c74
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
20742c74
编写于
4月 01, 2019
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
差异文件
Merge branch '5.1.x'
上级
eb753679
9c48d630
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
113 addition
and
14 deletion
+113
-14
spring-web/src/main/java/org/springframework/http/server/reactive/ChannelSendOperator.java
...ngframework/http/server/reactive/ChannelSendOperator.java
+30
-6
spring-web/src/test/java/org/springframework/http/server/reactive/ChannelSendOperatorTests.java
...mework/http/server/reactive/ChannelSendOperatorTests.java
+83
-8
未找到文件。
spring-web/src/main/java/org/springframework/http/server/reactive/ChannelSendOperator.java
浏览文件 @
20742c74
/*
* Copyright 2002-201
8
the original author or authors.
* Copyright 2002-201
9
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -28,6 +28,8 @@ import reactor.core.publisher.Mono;
import
reactor.core.publisher.Operators
;
import
reactor.util.context.Context
;
import
org.springframework.core.io.buffer.DataBuffer
;
import
org.springframework.core.io.buffer.DataBufferUtils
;
import
org.springframework.lang.Nullable
;
import
org.springframework.util.Assert
;
...
...
@@ -279,13 +281,20 @@ public class ChannelSendOperator<T> extends Mono<Void> implements Scannable {
}
private
boolean
emitCachedSignals
()
{
if
(
this
.
item
!=
null
)
{
requiredWriteSubscriber
().
onNext
(
this
.
item
);
}
if
(
this
.
error
!=
null
)
{
requiredWriteSubscriber
().
onError
(
this
.
error
);
try
{
requiredWriteSubscriber
().
onError
(
this
.
error
);
}
finally
{
releaseCachedItem
();
}
return
true
;
}
T
item
=
this
.
item
;
this
.
item
=
null
;
if
(
item
!=
null
)
{
requiredWriteSubscriber
().
onNext
(
item
);
}
if
(
this
.
completed
)
{
requiredWriteSubscriber
().
onComplete
();
return
true
;
...
...
@@ -298,7 +307,22 @@ public class ChannelSendOperator<T> extends Mono<Void> implements Scannable {
Subscription
s
=
this
.
subscription
;
if
(
s
!=
null
)
{
this
.
subscription
=
null
;
s
.
cancel
();
try
{
s
.
cancel
();
}
finally
{
releaseCachedItem
();
}
}
}
private
void
releaseCachedItem
()
{
synchronized
(
this
)
{
Object
item
=
this
.
item
;
if
(
item
instanceof
DataBuffer
)
{
DataBufferUtils
.
release
((
DataBuffer
)
item
);
}
this
.
item
=
null
;
}
}
...
...
spring-web/src/test/java/org/springframework/http/server/reactive/ChannelSendOperatorTests.java
浏览文件 @
20742c74
/*
* Copyright 2002-201
6
the original author or authors.
* Copyright 2002-201
9
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -16,25 +16,29 @@
package
org.springframework.http.server.reactive
;
import
java.nio.charset.StandardCharsets
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.concurrent.Executors
;
import
java.util.concurrent.TimeUnit
;
import
io.netty.buffer.ByteBufAllocator
;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.reactivestreams.Publisher
;
import
org.reactivestreams.Subscriber
;
import
org.reactivestreams.Subscription
;
import
reactor.core.publisher.BaseSubscriber
;
import
reactor.core.publisher.Flux
;
import
reactor.core.publisher.Mono
;
import
reactor.core.publisher.Signal
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertNotNull
;
import
static
org
.
junit
.
Assert
.
assertSame
;
import
static
org
.
junit
.
Assert
.
assertTrue
;
import
org.springframework.core.io.buffer.DataBuffer
;
import
org.springframework.core.io.buffer.LeakAwareDataBufferFactory
;
import
org.springframework.core.io.buffer.NettyDataBufferFactory
;
import
static
org
.
junit
.
Assert
.*;
/**
* @author Rossen Stoyanchev
...
...
@@ -50,9 +54,6 @@ public class ChannelSendOperatorTests {
this
.
writer
=
new
OneByOneAsyncWriter
();
}
private
<
T
>
Mono
<
Void
>
sendOperator
(
Publisher
<
String
>
source
){
return
new
ChannelSendOperator
<>(
source
,
writer:
:
send
);
}
@Test
public
void
errorBeforeFirstItem
()
throws
Exception
{
...
...
@@ -130,6 +131,66 @@ public class ChannelSendOperatorTests {
assertSame
(
error
,
this
.
writer
.
error
);
}
@Test
// gh-22720
public
void
cancelWhileItemCached
()
{
NettyDataBufferFactory
delegate
=
new
NettyDataBufferFactory
(
ByteBufAllocator
.
DEFAULT
);
LeakAwareDataBufferFactory
bufferFactory
=
new
LeakAwareDataBufferFactory
(
delegate
);
ChannelSendOperator
<
DataBuffer
>
operator
=
new
ChannelSendOperator
<>(
Mono
.
fromCallable
(()
->
{
DataBuffer
dataBuffer
=
bufferFactory
.
allocateBuffer
();
dataBuffer
.
write
(
"foo"
,
StandardCharsets
.
UTF_8
);
return
dataBuffer
;
}),
publisher
->
{
ZeroDemandSubscriber
subscriber
=
new
ZeroDemandSubscriber
();
publisher
.
subscribe
(
subscriber
);
return
Mono
.
never
();
});
BaseSubscriber
<
Void
>
subscriber
=
new
BaseSubscriber
<
Void
>()
{};
operator
.
subscribe
(
subscriber
);
subscriber
.
cancel
();
bufferFactory
.
checkForLeaks
();
}
@Test
// gh-22720
public
void
errorWhileItemCached
()
{
NettyDataBufferFactory
delegate
=
new
NettyDataBufferFactory
(
ByteBufAllocator
.
DEFAULT
);
LeakAwareDataBufferFactory
bufferFactory
=
new
LeakAwareDataBufferFactory
(
delegate
);
ZeroDemandSubscriber
writeSubscriber
=
new
ZeroDemandSubscriber
();
ChannelSendOperator
<
DataBuffer
>
operator
=
new
ChannelSendOperator
<>(
Flux
.
create
(
sink
->
{
DataBuffer
dataBuffer
=
bufferFactory
.
allocateBuffer
();
dataBuffer
.
write
(
"foo"
,
StandardCharsets
.
UTF_8
);
sink
.
next
(
dataBuffer
);
sink
.
error
(
new
IllegalStateException
(
"err"
));
}),
publisher
->
{
publisher
.
subscribe
(
writeSubscriber
);
return
Mono
.
never
();
});
operator
.
subscribe
(
new
BaseSubscriber
<
Void
>()
{});
try
{
writeSubscriber
.
signalDemand
(
1
);
// Let cached signals ("foo" and error) be published..
}
catch
(
Throwable
ex
)
{
assertNotNull
(
ex
.
getCause
());
assertEquals
(
"err"
,
ex
.
getCause
().
getMessage
());
}
bufferFactory
.
checkForLeaks
();
}
private
<
T
>
Mono
<
Void
>
sendOperator
(
Publisher
<
String
>
source
){
return
new
ChannelSendOperator
<>(
source
,
writer:
:
send
);
}
private
static
class
OneByOneAsyncWriter
{
...
...
@@ -182,4 +243,18 @@ public class ChannelSendOperatorTests {
}
}
private
static
class
ZeroDemandSubscriber
extends
BaseSubscriber
<
DataBuffer
>
{
@Override
protected
void
hookOnSubscribe
(
Subscription
subscription
)
{
// Just subscribe without requesting
}
public
void
signalDemand
(
long
demand
)
{
upstream
().
request
(
demand
);
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录