Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2BB2219071 for ; Mon, 21 Mar 2016 20:39:36 +0000 (UTC) Received: (qmail 38655 invoked by uid 500); 21 Mar 2016 20:39:36 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 38628 invoked by uid 500); 21 Mar 2016 20:39:36 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 38618 invoked by uid 99); 21 Mar 2016 20:39:36 -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; Mon, 21 Mar 2016 20:39:36 +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 839B8C0FA0 for ; Mon, 21 Mar 2016 20:39:35 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-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 187V8HFR6W0g for ; Mon, 21 Mar 2016 20:39:34 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with SMTP id C40F65FB2D for ; Mon, 21 Mar 2016 20:39:33 +0000 (UTC) Received: (qmail 38027 invoked by uid 99); 21 Mar 2016 20:39:32 -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, 21 Mar 2016 20:39:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 87110E00DB; Mon, 21 Mar 2016 20:39:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jensdeppe@apache.org To: commits@geode.incubator.apache.org Date: Mon, 21 Mar 2016 20:39:41 -0000 Message-Id: <80e0645d9c1f46f9a5b250edf418c1af@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/54] [abbrv] incubator-geode git commit: GEODE-1084 strip copyright from jgroups configuration before parsing GEODE-1084 strip copyright from jgroups configuration before parsing Remove the copyright comment from jgroups configuration string prior to adding settings and creating the JChannel. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7971a774 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7971a774 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7971a774 Branch: refs/heads/feature/GEODE-17-2 Commit: 7971a774b31a547cf4418bb6955f9a3bb1dc37ef Parents: dc9e28a Author: Bruce Schuchardt Authored: Mon Mar 14 09:26:49 2016 -0700 Committer: Bruce Schuchardt Committed: Mon Mar 14 09:34:50 2016 -0700 ---------------------------------------------------------------------- .../internal/membership/gms/messenger/JGroupsMessenger.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7971a774/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java index 75db969..d95d8df 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java @@ -197,6 +197,11 @@ public class JGroupsMessenger implements Messenger { throw new GemFireConfigException(LocalizedStrings.GroupMembershipService_AN_EXCEPTION_WAS_THROWN_WHILE_READING_JGROUPS_CONFIG.toLocalizedString(), ex); } + if (properties.startsWith(""); + properties = properties.substring(commentEnd+3); + } + if (transport.isMcastEnabled()) { properties = replaceStrings(properties, "MCAST_PORT", String.valueOf(transport.getMcastId().getPort()));