From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 13 Jan 2011 13:43:18 +0000 (+0000)
Subject: Refactor to simplify code and avoid a Findbugs warning
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=c7587e27187e96933b94bf67883338d044e2850a;p=tomcat7.0

Refactor to simplify code and avoid a Findbugs warning

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1058551 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/tribes/group/ChannelCoordinator.java b/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
index 3a35ba74e..3adc91042 100644
--- a/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
+++ b/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
@@ -45,17 +45,13 @@ public class ChannelCoordinator extends ChannelInterceptorBase implements Messag
     private ChannelSender clusterSender = new ReplicationTransmitter();
     private MembershipService membershipService = new McastService();
     
-    //override optionflag
-    protected int optionFlag = Channel.SEND_OPTIONS_BYTE_MESSAGE|Channel.SEND_OPTIONS_USE_ACK|Channel.SEND_OPTIONS_SYNCHRONIZED_ACK;
-    @Override
-    public int getOptionFlag() {return optionFlag;}
-    @Override
-    public void setOptionFlag(int flag) {optionFlag=flag;}
-    
     private int startLevel = 0;
 
     public ChannelCoordinator() {
-        
+        // Override default
+        this.optionFlag = Channel.SEND_OPTIONS_BYTE_MESSAGE |
+                Channel.SEND_OPTIONS_USE_ACK |
+                Channel.SEND_OPTIONS_SYNCHRONIZED_ACK;
     }
     
     public ChannelCoordinator(ChannelReceiver receiver,