Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
e3c87cba
Commit
e3c87cba
authored
Aug 27, 2019
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #17973 from dreis2211
* gh-17973: Fix upstream RSocket method renames Closes gh-17973
parents
c44a6dee
ec57f0c3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
RSocketServerAutoConfiguration.java
...autoconfigure/rsocket/RSocketServerAutoConfiguration.java
+2
-2
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfiguration.java
View file @
e3c87cba
...
@@ -71,7 +71,7 @@ public class RSocketServerAutoConfiguration {
...
@@ -71,7 +71,7 @@ public class RSocketServerAutoConfiguration {
RSocketWebSocketNettyRouteProvider
rSocketWebsocketRouteProvider
(
RSocketProperties
properties
,
RSocketWebSocketNettyRouteProvider
rSocketWebsocketRouteProvider
(
RSocketProperties
properties
,
RSocketMessageHandler
messageHandler
)
{
RSocketMessageHandler
messageHandler
)
{
return
new
RSocketWebSocketNettyRouteProvider
(
properties
.
getServer
().
getMappingPath
(),
return
new
RSocketWebSocketNettyRouteProvider
(
properties
.
getServer
().
getMappingPath
(),
messageHandler
.
serverR
esponder
());
messageHandler
.
r
esponder
());
}
}
}
}
...
@@ -104,7 +104,7 @@ public class RSocketServerAutoConfiguration {
...
@@ -104,7 +104,7 @@ public class RSocketServerAutoConfiguration {
@ConditionalOnMissingBean
@ConditionalOnMissingBean
RSocketServerBootstrap
rSocketServerBootstrap
(
RSocketServerFactory
rSocketServerFactory
,
RSocketServerBootstrap
rSocketServerBootstrap
(
RSocketServerFactory
rSocketServerFactory
,
RSocketMessageHandler
rSocketMessageHandler
)
{
RSocketMessageHandler
rSocketMessageHandler
)
{
return
new
RSocketServerBootstrap
(
rSocketServerFactory
,
rSocketMessageHandler
.
serverR
esponder
());
return
new
RSocketServerBootstrap
(
rSocketServerFactory
,
rSocketMessageHandler
.
r
esponder
());
}
}
@Bean
@Bean
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment