Refactoring.

Remove duplicated codes. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1721087 13f79535-47bb-0310-9956-ffa450edef68
apache · Dec 21, 2015 · 15f99ce · 15f99ce
1 parent cb82b37
commit 15f99ce
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java b/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
@@ -199,28 +199,16 @@ public void stop(int svc) throws ChannelException {
     }
 
     protected void sendLocalMember(Member[] members) {
-        if ( members == null || members.length == 0 ) return;
-        ChannelData data = new ChannelData(true);
-        data.setAddress(getLocalMember(false));
-        data.setTimestamp(System.currentTimeMillis());
-        data.setOptions(getOptionFlag());
-        data.setMessage(new XByteBuffer(MEMBER_START, false));
         try {
-            super.sendMessage(members, data, null);
+            sendMemberMessage(members, MEMBER_START);
         } catch (ChannelException cx) {
             log.warn(sm.getString("staticMembershipInterceptor.sendLocalMember.failed"),cx);
         }
     }
 
     protected void sendShutdown(Member[] members) {
-        if ( members == null || members.length == 0 ) return;
-        ChannelData data = new ChannelData(true);
-        data.setAddress(getLocalMember(false));
-        data.setTimestamp(System.currentTimeMillis());
-        data.setOptions(getOptionFlag());
-        data.setMessage(new XByteBuffer(MEMBER_STOP, false));
         try {
-            super.sendMessage(members, data, null);
+            sendMemberMessage(members, MEMBER_STOP);
         } catch (ChannelException cx) {
             log.warn(sm.getString("staticMembershipInterceptor.sendShutdown.failed"),cx);
         }
@@ -235,4 +223,14 @@ protected ChannelInterceptor getfirstInterceptor() {
         } while (now.getPrevious() != null);
         return result;
     }
+
+    protected void sendMemberMessage(Member[] members, byte[] message) throws ChannelException {
+        if ( members == null || members.length == 0 ) return;
+        ChannelData data = new ChannelData(true);
+        data.setAddress(getLocalMember(false));
+        data.setTimestamp(System.currentTimeMillis());
+        data.setOptions(getOptionFlag());
+        data.setMessage(new XByteBuffer(message, false));
+        super.sendMessage(members, data, null);
+    }
 }