Permalink
Browse files

Changed NAKACK to NAKACK2

  • Loading branch information...
1 parent 6805a86 commit a63b0757d0a81d7db4a46fe875507e37038533db @belaban committed Feb 3, 2012
Showing with 7 additions and 4 deletions.
  1. +7 −4 tests/junit/org/jgroups/tests/ReconciliationTest.java
View
11 tests/junit/org/jgroups/tests/ReconciliationTest.java
@@ -2,14 +2,17 @@
import org.jgroups.*;
import org.jgroups.protocols.DISCARD;
-import org.jgroups.protocols.pbcast.NAKACK;
+import org.jgroups.protocols.pbcast.NAKACK2;
import org.jgroups.stack.ProtocolStack;
import org.jgroups.util.Util;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.util.*;
/**
@@ -235,7 +238,7 @@ protected void reconciliationHelper(String[] names, FlushTrigger ft) throws Exce
/** Sets discard_delivered_msgs to false */
protected void modifyNAKACK(JChannel ch) {
if(ch == null) return;
- NAKACK nakack=(NAKACK)ch.getProtocolStack().findProtocol(NAKACK.class);
+ NAKACK2 nakack=(NAKACK2)ch.getProtocolStack().findProtocol(NAKACK2.class);
if(nakack != null)
nakack.setDiscardDeliveredMsgs(false);
}
@@ -251,7 +254,7 @@ private static void insertDISCARD(JChannel ch, Address exclude) throws Exception
DISCARD discard=new DISCARD();
discard.setExcludeItself(true);
discard.addIgnoreMember(exclude); // ignore messages from this member
- ch.getProtocolStack().insertProtocol(discard, ProtocolStack.BELOW, "NAKACK");
+ ch.getProtocolStack().insertProtocol(discard, ProtocolStack.BELOW, NAKACK2.class);
}
private static void removeDISCARD(JChannel...channels) throws Exception {

0 comments on commit a63b075

Please sign in to comment.