Browse files

checking if merge_kill_timeout (if > 0) < merge_timeout

  • Loading branch information...
1 parent 14de7b5 commit 6df668373612c9b80b9dff2e2e7448202c66f18a @belaban committed Oct 20, 2011
Showing with 3 additions and 0 deletions.
  1. +3 −0 src/org/jgroups/protocols/pbcast/GMS.java
View
3 src/org/jgroups/protocols/pbcast/GMS.java
@@ -322,6 +322,9 @@ public GmsImpl getImpl() {
public void init() throws Exception {
if(view_ack_collection_timeout <= 0)
throw new IllegalArgumentException("view_ack_collection_timeout has to be greater than 0");
+ if(merge_kill_timeout > 0 && merge_kill_timeout < merge_timeout)
+ throw new IllegalArgumentException("merge_kill_timeout (" + merge_kill_timeout +
+ ") needs to be less than merge_timeout (" +merge_timeout+")");
prev_members=new BoundedList<Address>(num_prev_mbrs);
prev_views=new BoundedList<Tuple<View,Long>>(num_prev_views);
TP transport=getTransport();

0 comments on commit 6df6683

Please sign in to comment.