geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [40/44] incubator-geode git commit: GEODE-1084 strip copyright from jgroups configuration before parsing
Date Tue, 15 Mar 2016 00:24:23 GMT
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-949-2
Commit: 7971a774b31a547cf4418bb6955f9a3bb1dc37ef
Parents: dc9e28a
Author: Bruce Schuchardt <bschuchardt@pivotal.io>
Authored: Mon Mar 14 09:26:49 2016 -0700
Committer: Bruce Schuchardt <bschuchardt@pivotal.io>
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("<!--")) {
+      int commentEnd = properties.indexOf("-->");
+      properties = properties.substring(commentEnd+3);
+    }
+    
     
     if (transport.isMcastEnabled()) {
       properties = replaceStrings(properties, "MCAST_PORT", String.valueOf(transport.getMcastId().getPort()));


Mime
View raw message