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 7CE18200C27 for ; Sun, 26 Feb 2017 11:15:27 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 7B5F2160B6E; Sun, 26 Feb 2017 10:15:27 +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 C6425160B59 for ; Sun, 26 Feb 2017 11:15:26 +0100 (CET) Received: (qmail 1548 invoked by uid 500); 26 Feb 2017 10:15:26 -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 1536 invoked by uid 99); 26 Feb 2017 10:15:26 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Feb 2017 10:15:26 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 820A7C0AAB for ; Sun, 26 Feb 2017 10:15:25 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.569 X-Spam-Level: X-Spam-Status: No, score=-3.569 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_NEUTRAL=0.652] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id mzCt7zplB_p9 for ; Sun, 26 Feb 2017 10:15:24 +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 F259D5F1C2 for ; Sun, 26 Feb 2017 10:15:23 +0000 (UTC) Received: (qmail 1533 invoked by uid 99); 26 Feb 2017 10:15:23 -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; Sun, 26 Feb 2017 10:15:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 16897DFCA1; Sun, 26 Feb 2017 10:15:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: plexus@apache.org To: commits@tamaya.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-tamaya-extensions git commit: [TAMAYA-243] Commited the actual change to the DefaultConfigChangeObserver. Messed up somehow the last commit. Date: Sun, 26 Feb 2017 10:15:23 +0000 (UTC) archived-at: Sun, 26 Feb 2017 10:15:27 -0000 Repository: incubator-tamaya-extensions Updated Branches: refs/heads/master 0f1a2c637 -> dd22364a9 [TAMAYA-243] Commited the actual change to the DefaultConfigChangeObserver. Messed up somehow the last commit. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/dd22364a Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/dd22364a Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/dd22364a Branch: refs/heads/master Commit: dd22364a9f16b2a0c3e68f43a4c1bacd5ad89423 Parents: 0f1a2c6 Author: Oliver B. Fischer Authored: Sun Feb 26 11:13:18 2017 +0100 Committer: Oliver B. Fischer Committed: Sun Feb 26 11:13:18 2017 +0100 ---------------------------------------------------------------------- .../tamaya/events/internal/DefaultConfigChangeObserver.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/dd22364a/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java ---------------------------------------------------------------------- diff --git a/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java b/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java index 9ee5ac2..eea22fe 100644 --- a/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java +++ b/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java @@ -70,13 +70,15 @@ public class DefaultConfigChangeObserver { FrozenConfiguration frozenConfig = FrozenConfiguration.of(ConfigurationProvider.getConfiguration()); ConfigurationChange changes; if(lastConfig==null){ - lastConfig = frozenConfig; changes = ConfigurationChangeBuilder.of().putAll(frozenConfig.getProperties()) .build(); }else{ changes = ConfigurationChangeBuilder.of(lastConfig).addChanges(frozenConfig) .build(); } + + lastConfig = frozenConfig; + if(!changes.isEmpty()) { LOG.info("Identified configuration changes, publishing changes:\n" + changes); ConfigEventManager.fireEvent(changes);