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 2017/10/12 22:22:06 UTC

incubator-tamaya-sandbox git commit: TAMAYA-260 Fixed issue not considering empty default value.

Repository: incubator-tamaya-sandbox
Updated Branches:
  refs/heads/master 2b878fa18 -> f5a1b5a35


TAMAYA-260 Fixed issue not considering empty default value.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/f5a1b5a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/f5a1b5a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/f5a1b5a3

Branch: refs/heads/master
Commit: f5a1b5a35bfa3def135e9f446daafb83d507eed4
Parents: 2b878fa
Author: Anatole Tresch <an...@apache.org>
Authored: Fri Oct 13 00:21:57 2017 +0200
Committer: Anatole Tresch <an...@apache.org>
Committed: Fri Oct 13 00:21:57 2017 +0200

----------------------------------------------------------------------
 .../tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/f5a1b5a3/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java
----------------------------------------------------------------------
diff --git a/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java b/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java
index c260023..d52f7b6 100644
--- a/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java
+++ b/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java
@@ -62,7 +62,7 @@ public class MicroprofileConfigurationProducer {
         // unless the extension is not installed, this should never happen because the extension
         // enforces the resolvability of the config
 
-        String defaultTextValue = annotation.defaultValue().isEmpty() ? null : annotation.defaultValue();
+        String defaultTextValue = annotation.defaultValue().equals(ConfigProperty.UNCONFIGURED_VALUE) ? null : annotation.defaultValue();
         ConversionContext conversionContext = createConversionContext(key, injectionPoint);
         Object value = resolveValue(defaultTextValue, conversionContext, injectionPoint);
         if (value == null) {