Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 66096200D2D for ; Fri, 13 Oct 2017 00:22:11 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6473C160BE4; Thu, 12 Oct 2017 22:22:11 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A9E461609E8 for ; Fri, 13 Oct 2017 00:22:10 +0200 (CEST) Received: (qmail 60378 invoked by uid 500); 12 Oct 2017 22:22:09 -0000 Mailing-List: contact commits-help@tamaya.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tamaya.incubator.apache.org Delivered-To: mailing list commits@tamaya.incubator.apache.org Received: (qmail 60369 invoked by uid 99); 12 Oct 2017 22:22:09 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Oct 2017 22:22:09 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 04DD81A037A for ; Thu, 12 Oct 2017 22:22:09 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.222 X-Spam-Level: X-Spam-Status: No, score=-4.222 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id zobWqpdFcNr5 for ; Thu, 12 Oct 2017 22:22:08 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 371085FDE0 for ; Thu, 12 Oct 2017 22:22:07 +0000 (UTC) Received: (qmail 60366 invoked by uid 99); 12 Oct 2017 22:22:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Oct 2017 22:22:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 36096DFA3C; Thu, 12 Oct 2017 22:22:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anatole@apache.org To: commits@tamaya.incubator.apache.org Message-Id: <06e4116cc7404527b405e161d2c0fd07@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-tamaya-sandbox git commit: TAMAYA-260 Fixed issue not considering empty default value. Date: Thu, 12 Oct 2017 22:22:06 +0000 (UTC) archived-at: Thu, 12 Oct 2017 22:22:11 -0000 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 Authored: Fri Oct 13 00:21:57 2017 +0200 Committer: Anatole Tresch 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) {