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 4E346200C4B for ; Mon, 20 Mar 2017 16:57:30 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 4D044160B81; Mon, 20 Mar 2017 15:57:30 +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 3C508160B9A for ; Mon, 20 Mar 2017 16:57:29 +0100 (CET) Received: (qmail 51835 invoked by uid 500); 20 Mar 2017 15:57:27 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 50966 invoked by uid 99); 20 Mar 2017 15:57:26 -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; Mon, 20 Mar 2017 15:57:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C7482DFFC2; Mon, 20 Mar 2017 15:57:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.apache.org Date: Mon, 20 Mar 2017 15:57:32 -0000 Message-Id: <95e99f4e5ce645a68a02607344accdf2@git.apache.org> In-Reply-To: <564d65327099482d88204fd528ca93eb@git.apache.org> References: <564d65327099482d88204fd528ca93eb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/11] brooklyn-server git commit: remove unnecessary marker default value archived-at: Mon, 20 Mar 2017 15:57:30 -0000 remove unnecessary marker default value Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/ed81635e Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/ed81635e Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/ed81635e Branch: refs/heads/master Commit: ed81635e3d4f85bf5d9bf978447d50080140e7e8 Parents: 1744145 Author: Alex Heneveld Authored: Tue Mar 7 15:20:42 2017 +0000 Committer: Alex Heneveld Committed: Tue Mar 7 15:20:42 2017 +0000 ---------------------------------------------------------------------- .../core/objs/AbstractConfigurationSupportInternal.java | 6 ------ 1 file changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ed81635e/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java index 113daac..95b6312 100644 --- a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java +++ b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java @@ -131,19 +131,13 @@ public abstract class AbstractConfigurationSupportInternal implements BrooklynOb // getRaw returns Maybe(val) if the key was explicitly set (where val can be null) // or Absent if the config key was unset. Object unresolved = getRaw(key).or(key.getDefaultValue()); - final Object marker = new Object(); Maybe resolved = Tasks.resolving(unresolved) .as(Object.class) - .defaultValue(marker) .immediately(true) .deep(true) .context(getContext()) .getMaybe(); if (resolved.isAbsent()) return Maybe.Absent.castAbsent(resolved); - if (resolved.get()==marker) { - // TODO changed Feb 2017, previously returned absent, in contrast to what the javadoc says - return Maybe.of((T)null); - } return TypeCoercions.tryCoerce(resolved.get(), key.getTypeToken()); }