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
39140945
Commit
39140945
authored
Mar 30, 2016
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
1043239d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
IntegrationAutoConfigurationTests.java
...figure/integration/IntegrationAutoConfigurationTests.java
+6
-4
FindMainClassTask.java
...rg/springframework/boot/gradle/run/FindMainClassTask.java
+1
-0
No files found.
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java
View file @
39140945
...
@@ -77,23 +77,25 @@ public class IntegrationAutoConfigurationTests {
...
@@ -77,23 +77,25 @@ public class IntegrationAutoConfigurationTests {
"org.springframework.integration.monitor"
);
"org.springframework.integration.monitor"
);
}
}
@Test
@Test
public
void
parentContext
()
{
public
void
parentContext
()
{
this
.
context
=
new
AnnotationConfigApplicationContext
();
this
.
context
=
new
AnnotationConfigApplicationContext
();
this
.
context
.
register
(
JmxAutoConfiguration
.
class
,
IntegrationAutoConfiguration
.
class
);
this
.
context
.
register
(
JmxAutoConfiguration
.
class
,
IntegrationAutoConfiguration
.
class
);
this
.
context
.
refresh
();
this
.
context
.
refresh
();
AnnotationConfigApplicationContext
parent
=
this
.
context
;
AnnotationConfigApplicationContext
parent
=
this
.
context
;
this
.
context
=
new
AnnotationConfigApplicationContext
();
this
.
context
=
new
AnnotationConfigApplicationContext
();
this
.
context
.
setParent
(
parent
);
this
.
context
.
setParent
(
parent
);
this
.
context
.
register
(
JmxAutoConfiguration
.
class
,
IntegrationAutoConfiguration
.
class
);
this
.
context
.
register
(
JmxAutoConfiguration
.
class
,
IntegrationAutoConfiguration
.
class
);
this
.
context
.
refresh
();
this
.
context
.
refresh
();
assertNotNull
(
this
.
context
.
getBean
(
HeaderChannelRegistry
.
class
));
assertNotNull
(
this
.
context
.
getBean
(
HeaderChannelRegistry
.
class
));
((
ConfigurableApplicationContext
)
this
.
context
.
getParent
()).
close
();
((
ConfigurableApplicationContext
)
this
.
context
.
getParent
()).
close
();
this
.
context
.
close
();
this
.
context
.
close
();
}
}
private
static
void
assertDomains
(
MBeanServer
mBeanServer
,
boolean
expected
,
String
...
domains
)
{
private
static
void
assertDomains
(
MBeanServer
mBeanServer
,
boolean
expected
,
String
...
domains
)
{
List
<
String
>
actual
=
Arrays
.
asList
(
mBeanServer
.
getDomains
());
List
<
String
>
actual
=
Arrays
.
asList
(
mBeanServer
.
getDomains
());
for
(
String
domain
:
domains
)
{
for
(
String
domain
:
domains
)
{
assertEquals
(
expected
,
actual
.
contains
(
domain
));
assertEquals
(
expected
,
actual
.
contains
(
domain
));
...
...
spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/FindMainClassTask.java
View file @
39140945
...
@@ -136,4 +136,5 @@ public class FindMainClassTask extends DefaultTask {
...
@@ -136,4 +136,5 @@ public class FindMainClassTask extends DefaultTask {
}
}
return
null
;
return
null
;
}
}
}
}
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