Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
4aac7c2e
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,发现更多精彩内容 >>
提交
4aac7c2e
编写于
1月 26, 2017
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Minor refactoring in Tomcat/Jetty adapters
上级
a2aaa055
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
17 addition
and
17 deletion
+17
-17
spring-web/src/main/java/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.java
...amework/http/server/reactive/JettyHttpHandlerAdapter.java
+2
-7
spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
...mework/http/server/reactive/ServletServerHttpRequest.java
+4
-0
spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpResponse.java
...ework/http/server/reactive/ServletServerHttpResponse.java
+10
-5
spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.java
...mework/http/server/reactive/TomcatHttpHandlerAdapter.java
+1
-5
未找到文件。
spring-web/src/main/java/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.java
浏览文件 @
4aac7c2e
...
@@ -19,14 +19,12 @@ package org.springframework.http.server.reactive;
...
@@ -19,14 +19,12 @@ package org.springframework.http.server.reactive;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.nio.ByteBuffer
;
import
java.nio.ByteBuffer
;
import
java.util.Map
;
import
java.util.Map
;
import
javax.servlet.AsyncContext
;
import
javax.servlet.AsyncContext
;
import
javax.servlet.ServletOutputStream
;
import
javax.servlet.annotation.WebServlet
;
import
javax.servlet.annotation.WebServlet
;
import
javax.servlet.http.HttpServlet
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
org.eclipse.jetty.server.HttpOutput
;
import
org.eclipse.jetty.server.HttpOutput
;
import
org.springframework.core.io.buffer.DataBuffer
;
import
org.springframework.core.io.buffer.DataBuffer
;
import
org.springframework.core.io.buffer.DataBufferFactory
;
import
org.springframework.core.io.buffer.DataBufferFactory
;
...
@@ -68,12 +66,9 @@ public class JettyHttpHandlerAdapter extends ServletHttpHandlerAdapter {
...
@@ -68,12 +66,9 @@ public class JettyHttpHandlerAdapter extends ServletHttpHandlerAdapter {
@Override
@Override
protected
int
writeToOutputStream
(
DataBuffer
dataBuffer
)
throws
IOException
{
protected
int
writeToOutputStream
(
DataBuffer
dataBuffer
)
throws
IOException
{
ServletOutputStream
outputStream
=
getServletResponse
().
getOutputStream
();
ByteBuffer
input
=
dataBuffer
.
asByteBuffer
();
ByteBuffer
input
=
dataBuffer
.
asByteBuffer
();
int
len
=
input
.
remaining
();
int
len
=
input
.
remaining
();
if
(
outputStream
.
isReady
()
&&
len
>
0
)
{
((
HttpOutput
)
getServletResponse
().
getOutputStream
()).
write
(
input
);
((
HttpOutput
)
outputStream
).
write
(
input
);
}
return
len
;
return
len
;
}
}
}
}
...
...
spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
浏览文件 @
4aac7c2e
...
@@ -180,6 +180,10 @@ public class ServletServerHttpRequest extends AbstractServerHttpRequest {
...
@@ -180,6 +180,10 @@ public class ServletServerHttpRequest extends AbstractServerHttpRequest {
return
Flux
.
from
(
this
.
bodyPublisher
);
return
Flux
.
from
(
this
.
bodyPublisher
);
}
}
/**
* Read from the request body InputStream and return a DataBuffer.
* Invoked only when {@link ServletInputStream#isReady()} returns "true".
*/
protected
DataBuffer
readFromInputStream
()
throws
IOException
{
protected
DataBuffer
readFromInputStream
()
throws
IOException
{
int
read
=
this
.
request
.
getInputStream
().
read
(
this
.
buffer
);
int
read
=
this
.
request
.
getInputStream
().
read
(
this
.
buffer
);
if
(
logger
.
isTraceEnabled
())
{
if
(
logger
.
isTraceEnabled
())
{
...
...
spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpResponse.java
浏览文件 @
4aac7c2e
...
@@ -132,6 +132,12 @@ public class ServletServerHttpResponse extends AbstractListenerServerHttpRespons
...
@@ -132,6 +132,12 @@ public class ServletServerHttpResponse extends AbstractListenerServerHttpRespons
return
processor
;
return
processor
;
}
}
/**
* Write the DataBuffer to the response body OutputStream.
* Invoked only when {@link ServletOutputStream#isReady()} returns "true"
* and the readable bytes in the DataBuffer is greater than 0.
* @return the number of bytes written
*/
protected
int
writeToOutputStream
(
DataBuffer
dataBuffer
)
throws
IOException
{
protected
int
writeToOutputStream
(
DataBuffer
dataBuffer
)
throws
IOException
{
ServletOutputStream
outputStream
=
response
.
getOutputStream
();
ServletOutputStream
outputStream
=
response
.
getOutputStream
();
InputStream
input
=
dataBuffer
.
asInputStream
();
InputStream
input
=
dataBuffer
.
asInputStream
();
...
@@ -285,14 +291,13 @@ public class ServletServerHttpResponse extends AbstractListenerServerHttpRespons
...
@@ -285,14 +291,13 @@ public class ServletServerHttpResponse extends AbstractListenerServerHttpRespons
if
(
this
.
logger
.
isTraceEnabled
())
{
if
(
this
.
logger
.
isTraceEnabled
())
{
this
.
logger
.
trace
(
"write: "
+
dataBuffer
+
" ready: "
+
ready
);
this
.
logger
.
trace
(
"write: "
+
dataBuffer
+
" ready: "
+
ready
);
}
}
i
f
(
ready
)
{
i
nt
remaining
=
dataBuffer
.
readableByteCount
();
int
total
=
dataBuffer
.
readableByteCount
();
if
(
ready
&&
remaining
>
0
)
{
int
written
=
writeToOutputStream
(
dataBuffer
);
int
written
=
writeToOutputStream
(
dataBuffer
);
if
(
this
.
logger
.
isTraceEnabled
())
{
if
(
this
.
logger
.
isTraceEnabled
())
{
this
.
logger
.
trace
(
"written: "
+
written
+
" total: "
+
total
);
this
.
logger
.
trace
(
"written: "
+
written
+
" total: "
+
remaining
);
}
}
return
written
==
total
;
return
written
==
remaining
;
}
}
else
{
else
{
return
false
;
return
false
;
...
...
spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.java
浏览文件 @
4aac7c2e
...
@@ -20,7 +20,6 @@ import java.io.IOException;
...
@@ -20,7 +20,6 @@ import java.io.IOException;
import
java.nio.ByteBuffer
;
import
java.nio.ByteBuffer
;
import
java.util.Map
;
import
java.util.Map
;
import
javax.servlet.AsyncContext
;
import
javax.servlet.AsyncContext
;
import
javax.servlet.ServletOutputStream
;
import
javax.servlet.annotation.WebServlet
;
import
javax.servlet.annotation.WebServlet
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
...
@@ -100,12 +99,9 @@ public class TomcatHttpHandlerAdapter extends ServletHttpHandlerAdapter {
...
@@ -100,12 +99,9 @@ public class TomcatHttpHandlerAdapter extends ServletHttpHandlerAdapter {
@Override
@Override
protected
int
writeToOutputStream
(
DataBuffer
dataBuffer
)
throws
IOException
{
protected
int
writeToOutputStream
(
DataBuffer
dataBuffer
)
throws
IOException
{
ServletOutputStream
outputStream
=
getServletResponse
().
getOutputStream
();
ByteBuffer
input
=
dataBuffer
.
asByteBuffer
();
ByteBuffer
input
=
dataBuffer
.
asByteBuffer
();
int
len
=
input
.
remaining
();
int
len
=
input
.
remaining
();
if
(
outputStream
.
isReady
()
&&
len
>
0
)
{
((
CoyoteOutputStream
)
getServletResponse
().
getOutputStream
()).
write
(
input
);
((
CoyoteOutputStream
)
outputStream
).
write
(
input
);
}
return
len
;
return
len
;
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录