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 2015/03/24 22:20:24 UTC
[07/16] incubator-tamaya git commit: Fixed message type. Bugfix:
accessing ConfigurationContext using the method provided by
ConfigurationProvider (instead of ServiceContext).
Fixed message type.
Bugfix: accessing ConfigurationContext using the method provided by ConfigurationProvider (instead of ServiceContext).
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/b3c35f80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/b3c35f80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/b3c35f80
Branch: refs/heads/master
Commit: b3c35f80d3176ce3cd6295db5487dfb8df9c1f39
Parents: adb5b39
Author: anatole <an...@apache.org>
Authored: Tue Mar 24 15:56:06 2015 +0100
Committer: anatole <an...@apache.org>
Committed: Tue Mar 24 15:56:06 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/tamaya/inject/internal/ConfiguredField.java | 2 +-
.../java/org/apache/tamaya/inject/internal/InjectionUtils.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b3c35f80/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredField.java
----------------------------------------------------------------------
diff --git a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredField.java b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredField.java
index c4a4fad..d85f787 100644
--- a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredField.java
+++ b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredField.java
@@ -114,7 +114,7 @@ public class ConfiguredField {
});
annotatedField.set(target, value);
} catch (Exception e) {
- throw new ConfigException("Failed to annotation configured field: " + this.annotatedField.getDeclaringClass()
+ throw new ConfigException("Failed to evaluate annotated field: " + this.annotatedField.getDeclaringClass()
.getName() + '.' + annotatedField.getName(), e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b3c35f80/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionUtils.java
----------------------------------------------------------------------
diff --git a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionUtils.java b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionUtils.java
index 80854d8..343336f 100644
--- a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionUtils.java
+++ b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionUtils.java
@@ -234,7 +234,7 @@ final class InjectionUtils {
if (String.class == targetType.getType()) {
return (T) configValue;
} else {
- List<PropertyConverter<T>> converters = ServiceContext.getInstance().getService(ConfigurationContext.class).get()
+ List<PropertyConverter<T>> converters = ConfigurationProvider.getConfigurationContext()
.getPropertyConverters(targetType);
for (PropertyConverter<T> converter : converters) {
adaptedValue = (T) converter.convert(configValue);