Skip to content

Commit

Permalink
Merge pull request #124 from rachmatowicz/JGRP-1793
Browse files Browse the repository at this point in the history
JGRP-1793
  • Loading branch information
belaban committed Feb 22, 2014
2 parents 3f97dc7 + 65cf388 commit 0dc02b9
Showing 1 changed file with 15 additions and 4 deletions.
19 changes: 15 additions & 4 deletions tests/junit/org/jgroups/tests/MergeTest.java
@@ -1,15 +1,26 @@
package org.jgroups.tests;

import org.jgroups.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

import org.jgroups.Address;
import org.jgroups.Event;
import org.jgroups.Global;
import org.jgroups.JChannel;
import org.jgroups.Membership;
import org.jgroups.View;
import org.jgroups.protocols.MERGE2;
import org.jgroups.protocols.pbcast.GMS;
import org.jgroups.protocols.pbcast.NAKACK2;
import org.jgroups.stack.ProtocolStack;
import org.jgroups.util.Util;
import org.testng.annotations.Test;

import java.util.*;

/**
* Tests merging on all stacks
*
Expand Down Expand Up @@ -92,7 +103,7 @@ private JChannel[] createChannels(String cluster_name, String[] members) throws

private static void close(JChannel[] channels) {
if(channels == null) return;
for(int i=channels.length -1; i <= 0; i--) {
for(int i=channels.length -1; i >= 0; i--) {
JChannel ch=channels[i];
Util.close(ch);
}
Expand Down

0 comments on commit 0dc02b9

Please sign in to comment.