Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Finding MERGE2 and MERGE3

  • Loading branch information...
commit 4ee6bb5f52ba2a66f7a1e3d614870a3011a5bf1d 1 parent b1f7477
Bela Ban authored

Showing 1 changed file with 4 additions and 2 deletions. Show diff stats Hide diff stats

  1. +4 2 tests/junit/org/jgroups/tests/DiscardTest.java
6 tests/junit/org/jgroups/tests/DiscardTest.java
... ... @@ -1,6 +1,8 @@
1 1 package org.jgroups.tests;
2 2
3 3
  4 +import org.jgroups.protocols.MERGE2;
  5 +import org.jgroups.protocols.MERGE3;
4 6 import org.testng.annotations.*;
5 7 import org.jgroups.*;
6 8 import org.jgroups.protocols.DISCARD;
@@ -63,11 +65,11 @@ private void _testLosslessReception(boolean discard) throws Exception {
63 65 Properties properties=new Properties();
64 66 properties.setProperty("down", "0.1");
65 67
66   - ch1.getProtocolStack().insertProtocol(discard_prot, ProtocolStack.BELOW, "MERGE2");
  68 + ch1.getProtocolStack().insertProtocol(discard_prot, ProtocolStack.BELOW, MERGE2.class, MERGE3.class);
67 69 discard_prot=new DISCARD();
68 70 properties=new Properties();
69 71 properties.setProperty("down", "0.1");
70   - ch2.getProtocolStack().insertProtocol(discard_prot, ProtocolStack.BELOW, "MERGE2");
  72 + ch2.getProtocolStack().insertProtocol(discard_prot, ProtocolStack.BELOW, MERGE2.class, MERGE3.class);
71 73 }
72 74
73 75 ch1.connect(GROUP);

0 comments on commit 4ee6bb5

Please sign in to comment.
Something went wrong with that request. Please try again.