Minor fixes from code review

Author: rmaucher

java/org/apache/catalina/tribes/group/ChannelCoordinator.java

@@ -213,10 +213,10 @@ protected synchronized void internalStart(int svc) throws ChannelException {
      *
      * @param svc int value of <BR>
      *                DEFAULT - will shutdown all services <BR>
-     *                MBR_RX_SEQ - starts the membership receiver <BR>
-     *                MBR_TX_SEQ - starts the membership broadcaster <BR>
-     *                SND_TX_SEQ - starts the replication transmitter<BR>
-     *                SND_RX_SEQ - starts the replication receiver<BR>
+     *                MBR_RX_SEQ - stops the membership receiver <BR>
+     *                MBR_TX_SEQ - stops the membership broadcaster <BR>
+     *                SND_TX_SEQ - stops the replication transmitter<BR>
+     *                SND_RX_SEQ - stops the replication receiver<BR>
      *
      * @throws ChannelException if a startup error occurs or the service is already started.
      */
@@ -260,7 +260,9 @@ protected synchronized void internalStop(int svc) throws ChannelException {
             }
 
             startLevel = (startLevel & (~svc));
-            setChannel(null);
+            if (startLevel == 0) {
+                setChannel(null);
+            }
         } catch (Exception e) {
             throw new ChannelException(e);
         }

java/org/apache/catalina/tribes/group/GroupChannel.java

@@ -119,7 +119,8 @@ public class GroupChannel extends ChannelInterceptorBase implements ManagedChann
     protected final List<ChannelListener> channelListeners = new CopyOnWriteArrayList<>();
 
     /**
-     * If set to true, the GroupChannel will check to make sure that
+     * If set to true, the GroupChannel will throw an error upon start if two interceptors
+     * are using the same option flag.
      */
     protected boolean optionCheck = false;
 

java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java

@@ -162,10 +162,9 @@ public void messageReceived(ChannelMessage msg) {
      */
     @Override
     public void setEncryptionAlgorithm(String algorithm) {
-        if (null == getEncryptionAlgorithm()) {
-            throw new IllegalStateException(sm.getString("encryptInterceptor.algorithm.required"));
+        if (algorithm == null) {
+            throw new IllegalArgumentException(sm.getString("encryptInterceptor.algorithm.required"));
         }
-
         int pos = algorithm.indexOf('/');
         if (pos < 0) {
             throw new IllegalArgumentException(sm.getString("encryptInterceptor.algorithm.required"));

java/org/apache/catalina/tribes/io/XByteBuffer.java

@@ -473,13 +473,13 @@ public static byte[] createDataPackage(ChannelData cdata) {
      * @return the output buffer
      */
     public static byte[] createDataPackage(byte[] data, int doff, int dlength, byte[] buffer, int bufoff) {
-        if ((buffer.length - bufoff) > getDataPackageLength(dlength)) {
+        if ((buffer.length - bufoff) < getDataPackageLength(dlength)) {
             throw new ArrayIndexOutOfBoundsException(sm.getString("xByteBuffer.unableCreate"));
         }
         System.arraycopy(START_DATA, 0, buffer, bufoff, START_DATA.length);
-        toBytes(data.length, buffer, bufoff + START_DATA.length);
+        toBytes(dlength, buffer, bufoff + START_DATA.length);
         System.arraycopy(data, doff, buffer, bufoff + START_DATA.length + 4, dlength);
-        System.arraycopy(END_DATA, 0, buffer, bufoff + START_DATA.length + 4 + data.length, END_DATA.length);
+        System.arraycopy(END_DATA, 0, buffer, bufoff + START_DATA.length + 4 + dlength, END_DATA.length);
         return buffer;
     }
 

java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java

@@ -19,7 +19,6 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.net.InetAddress;
-import java.net.URLEncoder;
 import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -132,7 +131,6 @@ public void start(int level) throws Exception {
         if (log.isDebugEnabled()) {
             log.debug(sm.getString("cloudMembershipProvider.start", dnsServiceName));
         }
-        dnsServiceName = URLEncoder.encode(dnsServiceName, StandardCharsets.UTF_8);
 
         // Fetch initial members
         heartbeat();
@@ -204,11 +202,12 @@ public boolean accept(Serializable msg, Member sender) {
             byte[] host = sender.getHost();
             int i = 0;
             StringBuilder buf = new StringBuilder();
-            buf.append(host[i++] & 0xff);
-            for (; i < host.length; i++) {
-                buf.append('.').append(host[i] & 0xff);
+            if (host.length > 0 ) {
+                buf.append(host[i++] & 0xff);
+                for (; i < host.length; i++) {
+                    buf.append('.').append(host[i] & 0xff);
+                }
             }
-
             byte[] id = digest(buf.toString().getBytes(StandardCharsets.US_ASCII));
             member.setUniqueId(id);
             member.setMemberAliveTime(-1);

java/org/apache/catalina/tribes/transport/nio/NioSender.java

@@ -186,7 +186,6 @@ private void configureSocket() throws IOException {
             socketChannel.socket().setSendBufferSize(getTxBufSize());
             socketChannel.socket().setReceiveBufferSize(getRxBufSize());
             socketChannel.socket().setSoTimeout((int) getTimeout());
-            socketChannel.socket().setSoLinger(getSoLingerOn(), getSoLingerOn() ? getSoLingerTime() : 0);
             socketChannel.socket().setTcpNoDelay(getTcpNoDelay());
             socketChannel.socket().setKeepAlive(getSoKeepAlive());
             socketChannel.socket().setReuseAddress(getSoReuseAddress());

java/org/apache/catalina/tribes/util/Arrays.java

@@ -63,7 +63,7 @@ public static boolean contains(byte[] source, int srcoffset, byte[] key, int key
         }
         boolean match = true;
         int pos = keyoffset;
-        for (int i = srcoffset; match && i < length; i++) {
+        for (int i = srcoffset; match && i < srcoffset + length; i++) {
             match = (source[i] == key[pos++]);
         }
         return match;

java/org/apache/catalina/tribes/util/UUIDGenerator.java

@@ -23,7 +23,7 @@
 import org.apache.juli.logging.LogFactory;
 
 /**
- * Smple generation of a UUID.
+ * Simple generation of a UUID.
  */
 public class UUIDGenerator {
     /**