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
a63ec53d
Commit
a63ec53d
authored
Sep 24, 2015
by
Phillip Webb
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3962 from izeye/hazelcast
* pr/3962: Remove duplicate `@ConditionalOnMissingBean` checks.
parents
926b40e4
efb699de
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
3 deletions
+1
-3
HazelcastAutoConfiguration.java
...t/autoconfigure/hazelcast/HazelcastAutoConfiguration.java
+1
-3
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfiguration.java
View file @
a63ec53d
...
...
@@ -49,7 +49,7 @@ import com.hazelcast.core.HazelcastInstance;
public
class
HazelcastAutoConfiguration
{
@Configuration
@ConditionalOnMissingBean
(
{
HazelcastInstance
.
class
,
Config
.
class
}
)
@ConditionalOnMissingBean
(
Config
.
class
)
@Conditional
(
ConfigAvailableCondition
.
class
)
static
class
HazelcastConfigFileConfiguration
{
...
...
@@ -57,7 +57,6 @@ public class HazelcastAutoConfiguration {
private
HazelcastProperties
hazelcastProperties
;
@Bean
@ConditionalOnMissingBean
public
HazelcastInstance
hazelcastInstance
()
throws
IOException
{
Resource
config
=
this
.
hazelcastProperties
.
resolveConfigLocation
();
if
(
config
!=
null
)
{
...
...
@@ -69,7 +68,6 @@ public class HazelcastAutoConfiguration {
}
@Configuration
@ConditionalOnMissingBean
(
HazelcastInstance
.
class
)
@ConditionalOnSingleCandidate
(
Config
.
class
)
static
class
HazelcastConfigConfiguration
{
...
...
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