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
f08f948c
Commit
f08f948c
authored
Aug 26, 2020
by
spencergibb
Committed by
Andy Wilkinson
Aug 26, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle null RSocketServer address when setting port property
See gh-23084
parent
066471b1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
76 additions
and
1 deletion
+76
-1
RSocketPortInfoApplicationContextInitializer.java
...context/RSocketPortInfoApplicationContextInitializer.java
+3
-1
RSocketPortInfoApplicationContextInitializerTests.java
...xt/RSocketPortInfoApplicationContextInitializerTests.java
+73
-0
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializer.java
View file @
f08f948c
...
...
@@ -63,7 +63,9 @@ public class RSocketPortInfoApplicationContextInitializer
@Override
public
void
onApplicationEvent
(
RSocketServerInitializedEvent
event
)
{
setPortProperty
(
this
.
applicationContext
,
event
.
getServer
().
address
().
getPort
());
if
(
event
.
getServer
().
address
()
!=
null
)
{
setPortProperty
(
this
.
applicationContext
,
event
.
getServer
().
address
().
getPort
());
}
}
private
void
setPortProperty
(
ApplicationContext
context
,
int
port
)
{
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializerTests.java
0 → 100644
View file @
f08f948c
/*
* Copyright 2012-2019 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org
.
springframework
.
boot
.
rsocket
.
context
;
import
java.net.InetSocketAddress
;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.extension.ExtendWith
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.rsocket.server.RSocketServer
;
import
org.springframework.boot.rsocket.server.RSocketServerException
;
import
org.springframework.context.ApplicationEventPublisher
;
import
org.springframework.context.ConfigurableApplicationContext
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.test.context.junit.jupiter.SpringExtension
;
@ExtendWith
(
SpringExtension
.
class
)
public
class
RSocketPortInfoApplicationContextInitializerTests
{
@Autowired
private
RSocketPortInfoApplicationContextInitializer
initializer
;
@Autowired
private
ConfigurableApplicationContext
context
;
@Autowired
private
ApplicationEventPublisher
publisher
;
@Test
void
nullAddressDoesNotThrow
()
{
initializer
.
initialize
(
context
);
publisher
.
publishEvent
(
new
RSocketServerInitializedEvent
(
new
RSocketServer
()
{
@Override
public
void
start
()
throws
RSocketServerException
{
}
@Override
public
void
stop
()
throws
RSocketServerException
{
}
@Override
public
InetSocketAddress
address
()
{
return
null
;
}
}));
}
@Configuration
(
proxyBeanMethods
=
false
)
static
class
Config
{
@Bean
public
RSocketPortInfoApplicationContextInitializer
rSocketPortInfoApplicationContextInitializer
()
{
return
new
RSocketPortInfoApplicationContextInitializer
();
}
}
}
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