From fe29f0545af5854989a072c00c996ba05433cbcb Mon Sep 17 00:00:00 2001
From: Bela Ban <belaban@yahoo.com>
Date: Wed, 1 Jun 2016 10:48:17 +0200
Subject: [PATCH] Fix for incorrect backport of serialization optimization
 (https://issues.jboss.org/browse/JGRP-2071)

---
 src/org/jgroups/protocols/FlowControl.java |  7 ++++---
 src/org/jgroups/protocols/MFC.java         | 17 ++++-------------
 src/org/jgroups/protocols/UFC.java         | 15 +++------------
 3 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/src/org/jgroups/protocols/FlowControl.java b/src/org/jgroups/protocols/FlowControl.java
index 6055aa289e..9c6a0cde66 100644
--- a/src/org/jgroups/protocols/FlowControl.java
+++ b/src/org/jgroups/protocols/FlowControl.java
@@ -263,7 +263,10 @@ protected long getMaxBlockTime(long length) {
      */
     protected abstract boolean handleMulticastMessage();
 
-    protected abstract void handleCredit(Address sender, long increase);
+    protected abstract void    handleCredit(Address sender, long increase);
+
+    protected abstract Header  getReplenishHeader();
+    protected abstract Header  getCreditRequestHeader();
 
 
     /**
@@ -502,7 +505,6 @@ protected void sendCredit(Address dest, long credits) {
         num_credit_responses_sent++;
     }
 
-    protected abstract Header getReplenishHeader();
 
     /**
      * We cannot send this request as OOB message, as the credit request needs to queue up behind the regular messages;
@@ -519,7 +521,6 @@ protected void sendCreditRequest(final Address dest, long credits_needed) {
         num_credit_requests_sent++;
     }
 
-    protected abstract Header getCreditRequestHeader();
 
 
     protected void handleViewChange(List<Address> mbrs) {
diff --git a/src/org/jgroups/protocols/MFC.java b/src/org/jgroups/protocols/MFC.java
index 608038f2f4..8a03fc9cec 100644
--- a/src/org/jgroups/protocols/MFC.java
+++ b/src/org/jgroups/protocols/MFC.java
@@ -37,7 +37,7 @@
  */
 @MBean(description="Simple flow control protocol based on a credit system")
 public class MFC extends FlowControl {
-    protected final static FcHeader MFC_REPLENISH_HDR = new FcHeader(FcHeader.REPLENISH);
+    protected final static FcHeader MFC_REPLENISH_HDR      = new FcHeader(FcHeader.REPLENISH);
     protected final static FcHeader MFC_CREDIT_REQUEST_HDR = new FcHeader(FcHeader.CREDIT_REQUEST);
 
     
@@ -82,9 +82,9 @@ public double getAverageTimeBlocked() {
         return credits.getAverageBlockTime();
     }
 
-    protected boolean handleMulticastMessage() {
-        return true;
-    }
+    protected boolean          handleMulticastMessage() {return true;}
+    @Override protected Header getReplenishHeader()     {return MFC_REPLENISH_HDR;}
+    @Override protected Header getCreditRequestHeader() {return MFC_CREDIT_REQUEST_HDR;}
 
    
     public void init() throws Exception {
@@ -123,15 +123,6 @@ protected Object handleDownMessage(final Event evt, final Message msg, Address d
         return down_prot.down(evt);
     }
 
-    @Override
-    protected Header getReplenishHeader() {
-        return MFC_REPLENISH_HDR;
-    }
-
-    @Override
-    protected Header getCreditRequestHeader() {
-        return MFC_CREDIT_REQUEST_HDR;
-    }
 
 
     protected synchronized boolean needToSendCreditRequest() {
diff --git a/src/org/jgroups/protocols/UFC.java b/src/org/jgroups/protocols/UFC.java
index 991b3c2418..fdef875346 100644
--- a/src/org/jgroups/protocols/UFC.java
+++ b/src/org/jgroups/protocols/UFC.java
@@ -68,10 +68,9 @@ public Map<String, Object> dumpStats() {
         return retval;
     }
 
-
-    protected boolean handleMulticastMessage() {
-        return false;
-    }
+    protected boolean handleMulticastMessage()          {return false;}
+    @Override protected Header getReplenishHeader()     {return UFC_REPLENISH_HDR;}
+    @Override protected Header getCreditRequestHeader() {return UFC_CREDIT_REQUEST_HDR;}
 
 
 
@@ -138,15 +137,7 @@ protected Object handleDownMessage(final Event evt, final Message msg, Address d
         return down_prot.down(evt);
     }
 
-    @Override
-    protected Header getReplenishHeader() {
-        return UFC_REPLENISH_HDR;
-    }
 
-    @Override
-    protected Header getCreditRequestHeader() {
-        return UFC_CREDIT_REQUEST_HDR;
-    }
 
 
     protected void handleViewChange(List<Address> mbrs) {