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 98292200C92 for ; Mon, 12 Jun 2017 19:27:02 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 96BAD160BD9; Mon, 12 Jun 2017 17:27:02 +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 DCD88160BCF for ; Mon, 12 Jun 2017 19:27:01 +0200 (CEST) Received: (qmail 93111 invoked by uid 500); 12 Jun 2017 17:27:01 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 93102 invoked by uid 99); 12 Jun 2017 17:27:01 -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, 12 Jun 2017 17:27:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3FDE0E037F; Mon, 12 Jun 2017 17:26:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.apache.org Message-Id: <6d3f1a8a0757444e931e99ae41c23b68@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: geode git commit: Fix format Date: Mon, 12 Jun 2017 17:26:59 +0000 (UTC) archived-at: Mon, 12 Jun 2017 17:27:02 -0000 Repository: geode Updated Branches: refs/heads/feature/GEODE-3062 7310fd126 -> 3ff9725f1 Fix format Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/3ff9725f Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/3ff9725f Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/3ff9725f Branch: refs/heads/feature/GEODE-3062 Commit: 3ff9725f10bf94f28969384a867bcc70a4f23c95 Parents: 7310fd1 Author: Kirk Lund Authored: Mon Jun 12 10:26:53 2017 -0700 Committer: Kirk Lund Committed: Mon Jun 12 10:26:53 2017 -0700 ---------------------------------------------------------------------- .../geode/internal/cache/ClusterConfigurationLoader.java | 6 ++++-- .../java/org/apache/geode/internal/cache/GemFireCacheImpl.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/3ff9725f/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java index be0dbbf..92cfd96 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java @@ -152,10 +152,12 @@ public class ClusterConfigurationLoader { /*** * Apply the gemfire properties cluster configuration on this member - * @param response {@link ConfigurationResponse} containing the requested {@link Configuration} + * + * @param response {@link ConfigurationResponse} containing the requested {@link Configuration} * @param config this member's config */ - public static void applyClusterPropertiesConfiguration(ConfigurationResponse response, DistributionConfig config) { + public static void applyClusterPropertiesConfiguration(ConfigurationResponse response, + DistributionConfig config) { if (response == null || response.getRequestedConfiguration().isEmpty()) { return; } http://git-wip-us.apache.org/repos/asf/geode/blob/3ff9725f/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java index f223872..780810d 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java @@ -1198,7 +1198,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has // Deploy all the jars from the deploy working dir. ClassPathLoader.getLatest().getJarDeployer().loadPreviouslyDeployedJarsFromDisk(); } - ClusterConfigurationLoader.applyClusterXmlConfiguration(this,this. configurationResponse, + ClusterConfigurationLoader.applyClusterXmlConfiguration(this, this.configurationResponse, this.system.getConfig()); initializeDeclarativeCache(); completedCacheXml = true;