[2/2] incubator-gossip git commit: Small merge conflict

[ecapriolo]

Small merge conflict


Project: http://git-wip-us.apache.org/repos/asf/incubator-gossip/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gossip/commit/9fecfec8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gossip/tree/9fecfec8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gossip/diff/9fecfec8

Branch: refs/heads/master
Commit: 9fecfec8a2034ff17b1c70f0e5027a2afa838398
Parents: 5ed3ed8 7c457eb
Author: edward <edw...@hollywood.ian>
Authored: Sun Sep 3 14:40:45 2017 -0400
Committer: edward <edw...@hollywood.ian>
Committed: Sun Sep 3 14:40:45 2017 -0400

----------------------------------------------------------------------
 .../java/org/apache/gossip/GossipSettings.java  |  25 +++-
 .../java/org/apache/gossip/StartupSettings.java |  16 ++-
 .../gossip/manager/AbstractActiveGossiper.java  | 144 ++++++++++++++-----
 .../manager/handlers/MessageHandlerFactory.java |  25 ++--
 .../handlers/PerNodeDataBulkMessageHandler.java |  41 ++++++
 .../handlers/PerNodeDataMessageHandler.java     |   2 +-
 .../handlers/SharedDataBulkMessageHandler.java  |  41 ++++++
 .../main/java/org/apache/gossip/model/Base.java |   8 +-
 .../gossip/model/PerNodeDataBulkMessage.java    |  39 +++++
 .../gossip/model/SharedDataBulkMessage.java     |  39 +++++
 .../apache/gossip/model/SharedDataMessage.java  |   2 +-
 .../gossip/udp/UdpPerNodeDataBulkMessage.java   |  49 +++++++
 .../gossip/udp/UdpSharedDataBulkMessage.java    |  49 +++++++
 .../org/apache/gossip/PerNodeDataEventTest.java |  30 ++--
 .../org/apache/gossip/SharedDataEventTest.java  |  31 ++--
 .../org/apache/gossip/ShutdownDeadtimeTest.java |   2 +-
 .../org/apache/gossip/TenNodeThreeSeedTest.java |   2 +-
 17 files changed, 470 insertions(+), 75 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-gossip/blob/9fecfec8/gossip-base/src/main/java/org/apache/gossip/GossipSettings.java
----------------------------------------------------------------------
diff --cc gossip-base/src/main/java/org/apache/gossip/GossipSettings.java
index 4ea0ab6,2ba9110..2fe8a0c
--- a/gossip-base/src/main/java/org/apache/gossip/GossipSettings.java
+++ b/gossip-base/src/main/java/org/apache/gossip/GossipSettings.java
@@@ -64,10 -62,11 +64,14 @@@ public class GossipSettings 
    
    private boolean signMessages = false;
  
 +  // Settings related to lock manager
 +  private LockManagerSettings lockManagerSettings = LockManagerSettings
 +          .getLockManagerDefaultSettings();
 +  
+   private boolean bulkTransfer = false;
+ 
+   private int bulkTransferSize = StartupSettings.DEFAULT_BULK_TRANSFER_SIZE;
+   
 -  
    /**
     * Construct GossipSettings with default settings.
     */
@@@ -247,15 -247,19 +252,31 @@@
      this.protocolManagerClass = protocolManagerClass;
    }
  
 +  public LockManagerSettings getLockManagerSettings() {
 +    return lockManagerSettings;
 +  }
 +
 +  /**
 +   * Set the lock settings use by the lock manager
 +   * @param lockManagerSettings lock settings. This object cannot be null.
 +   */
 +  public void setLockManagerSettings(LockManagerSettings lockManagerSettings) 
{
 +    this.lockManagerSettings = lockManagerSettings;
 +  }
++
+   public boolean isBulkTransfer() {
+     return bulkTransfer;
+   }
+ 
+   public void setBulkTransfer(boolean bulkTransfer) {
+     this.bulkTransfer = bulkTransfer;
+   }
+ 
+   public int getBulkTransferSize() {
+     return bulkTransferSize;
+   }
+ 
+   public void setBulkTransferSize(int bulkTransferSize) {
+     this.bulkTransferSize = bulkTransferSize;
+   }
  }