Fixed merge issue by making TUNNEL 'multicast-capable' (https://issues.jboss.org/browse/JGRP-1608)

belaban · belaban · commit 0d62fa73573a · 2013-03-24T15:57:50.000+01:00
diff --git a/conf/tunnel.xml b/conf/tunnel.xml
@@ -21,5 +21,4 @@
     <MFC/>
     <FRAG2/>
     <pbcast.STATE_TRANSFER/>
-    <pbcast.FLUSH timeout="2000"/>
 </config>
diff --git a/src/org/jgroups/protocols/TUNNEL.java b/src/org/jgroups/protocols/TUNNEL.java
@@ -1,33 +1,27 @@
 
 package org.jgroups.protocols;
 
-import java.io.DataInputStream;
-import java.net.DatagramSocket;
-import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
 import org.jgroups.Address;
 import org.jgroups.Event;
-import org.jgroups.Global;
 import org.jgroups.Message;
 import org.jgroups.PhysicalAddress;
 import org.jgroups.annotations.Experimental;
 import org.jgroups.annotations.Property;
-import org.jgroups.stack.GossipData;
-import org.jgroups.stack.GossipRouter;
-import org.jgroups.stack.RouterStubManager;
-import org.jgroups.stack.IpAddress;
-import org.jgroups.stack.Protocol;
-import org.jgroups.stack.RouterStub;
+import org.jgroups.stack.*;
 import org.jgroups.util.Buffer;
 import org.jgroups.util.ExposedByteArrayOutputStream;
 import org.jgroups.util.ExposedDataOutputStream;
 import org.jgroups.util.Util;
 
+import java.io.DataInputStream;
+import java.net.DatagramSocket;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * Replacement for UDP. Instead of sending packets via UDP, a TCP connection is opened to a Router
  * (using the RouterStub client-side stub), the IP address/port of which was given using channel
@@ -75,7 +69,7 @@ public TUNNEL() {
    }
 
     public boolean supportsMulticasting() {
-        return false;
+        return true;
     }
 
     @Property(description="A comma-separated list of GossipRouter hosts, e.g. HostA[12001],HostB[12001]")
