Skip to content

Commit

Permalink
Remove spring dependencies from internal code(#3937)
Browse files Browse the repository at this point in the history
  • Loading branch information
klboke authored and nobodyiam committed Sep 8, 2021
1 parent f3512f9 commit 1ddfa08
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Release Notes.
Apollo 1.9.1

------------------
* [Remove spring dependencies from internal code](https://github.com/apolloconfig/apollo/pull/3937)

------------------
All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/9?closed=1)
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@
import com.ctrip.framework.apollo.util.ExceptionUtil;
import com.google.common.collect.ImmutableMap;
import com.google.common.util.concurrent.RateLimiter;
import org.springframework.util.CollectionUtils;


/**
* @author Jason Song([email protected])
Expand Down Expand Up @@ -186,10 +184,10 @@ public Set<String> getPropertyNames() {
// propertyNames include system property and system env might cause some compatibility issues, though that looks like the correct implementation.
Set<String> fromRepository = this.getPropertyNamesFromRepository();
Set<String> fromAdditional = this.getPropertyNamesFromAdditional();
if (CollectionUtils.isEmpty(fromRepository)) {
if (fromRepository == null || fromRepository.isEmpty()) {
return fromAdditional;
}
if (CollectionUtils.isEmpty(fromAdditional)) {
if (fromAdditional == null || fromAdditional.isEmpty()) {
return fromRepository;
}
Set<String> propertyNames = Sets
Expand Down

0 comments on commit 1ddfa08

Please sign in to comment.