You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2016/03/01 17:47:55 UTC
[09/14] incubator-tamaya git commit: Added missing test config.
Added missing test config.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/732bd31f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/732bd31f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/732bd31f
Branch: refs/heads/master
Commit: 732bd31fab518a4bdbc539bdf82bdef397b2740e
Parents: 930eb1a
Author: anatole <an...@apache.org>
Authored: Tue Mar 1 17:44:20 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Tue Mar 1 17:44:20 2016 +0100
----------------------------------------------------------------------
.../org/apache/tamaya/inject/internal/InjectionHelper.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/732bd31f/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
----------------------------------------------------------------------
diff --git a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
index 1a71586..2b7271f 100644
--- a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
+++ b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
@@ -184,11 +184,14 @@ final class InjectionHelper {
}
if (String.class == targetType.getType()) {
return (T) configValue;
- } else {
+ } else{
+ if(configValue==null) {
+ return null;
+ }
List<PropertyConverter<T>> converters = ConfigurationProvider.getConfigurationContext()
.getPropertyConverters(targetType);
ConversionContext ctx = new ConversionContext.Builder(ConfigurationProvider.getConfiguration(),
- ConfigurationProvider.getConfigurationContext(), key,targetType)
+ ConfigurationProvider.getConfigurationContext(), key, targetType)
.setAnnotatedElement(element).build();
for (PropertyConverter<T> converter : converters) {
adaptedValue = converter.convert(configValue, ctx);
@@ -196,8 +199,8 @@ final class InjectionHelper {
return adaptedValue;
}
}
- throw new ConfigException("Non convertible property type: " + element);
}
+ throw new ConfigException("Non convertible property type: " + element);
}
/**