TAMAYA-182: Added Null check.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/4cfc2d31 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/4cfc2d31 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/4cfc2d31 Branch: refs/heads/master Commit: 4cfc2d31f02894414f3c3f94f0051592ccaeacb4 Parents: 76963e7 Author: anatole <anat...@apache.org> Authored: Fri Oct 28 00:27:31 2016 +0200 Committer: anatole <anat...@apache.org> Committed: Fri Oct 28 00:27:31 2016 +0200 ---------------------------------------------------------------------- .../tamaya/core/internal/DefaultConfigurationContextBuilder.java | 4 ++-- .../apache/tamaya/core/propertysource/SimplePropertySource.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4cfc2d31/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java b/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java index f3d823e..486fb05 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java @@ -172,7 +172,7 @@ public class DefaultConfigurationContextBuilder implements ConfigurationContextB return this; } - public PropertySource getPropertySource(String name) { + private PropertySource getPropertySource(String name) { for(PropertySource ps:propertySources){ if(ps.getName().equals(name)){ return ps; @@ -357,7 +357,7 @@ public class DefaultConfigurationContextBuilder implements ConfigurationContextB } - protected Map<TypeLiteral, Collection<PropertyConverter>> getDefaultPropertyConverters() { + private Map<TypeLiteral, Collection<PropertyConverter>> getDefaultPropertyConverters() { Map<TypeLiteral, Collection<PropertyConverter>> result = new HashMap<>(); for (PropertyConverter conv : ServiceContextManager.getServiceContext().getServices( PropertyConverter.class)) { http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4cfc2d31/code/core/src/main/java/org/apache/tamaya/core/propertysource/SimplePropertySource.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/propertysource/SimplePropertySource.java b/code/core/src/main/java/org/apache/tamaya/core/propertysource/SimplePropertySource.java index e875d8c..bce68da 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/propertysource/SimplePropertySource.java +++ b/code/core/src/main/java/org/apache/tamaya/core/propertysource/SimplePropertySource.java @@ -70,7 +70,7 @@ public class SimplePropertySource extends BasePropertySource { */ public SimplePropertySource(URL propertiesLocation) { super(0); - this.properties = load(propertiesLocation); + this.properties = load(Objects.requireNonNull(propertiesLocation)); this.name = propertiesLocation.toString(); }
