GOSSIP-2 rebase

2016-06-07 22:52:20 -04:00
parent ddc9a67dd6
commit 900bfda955
3 changed files with 186 additions and 0 deletions
--- a/src/main/java/org/apache/gossip/GossipService.java
+++ b/src/main/java/org/apache/gossip/GossipService.java
@ -60,8 +60,20 @@ public class GossipService {
  public GossipService(String cluster, URI uri, String id,
          List<GossipMember> gossipMembers, GossipSettings settings, GossipListener listener)
          throws InterruptedException, UnknownHostException {
+<<<<<<< HEAD
    gossipManager = new RandomGossipManager(cluster, uri, id, settings, gossipMembers,
            listener);
+=======
+    gossipManager = RandomGossipManager.newBuilder()
+        .withId(id)
+        .cluster(cluster)
+        .address(ipAddress)
+        .port(port)
+        .settings(settings)
+        .gossipMembers(gossipMembers)
+        .listener(listener)
+        .build();
+>>>>>>> fe196cd... GOSSIP-4: Use builder to create RandomGossipManager (Jaideep Dhok via EGC)
  }

  public void start() {