natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

multicast增加\n结束符 

git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@158 1a56cb94-b969-4eaa-88fa-be21384802f2
This commit is contained in:
william.liangf 2011-11-01 06:35:22 +00:00
parent 822ce38200
commit e7a99dc2a9
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dubbo-registry-multicast/src/main/java/com/alibaba/dubbo/registry/multicast/MulticastRegistry.java
View File

@ -21,6 +21,7 @@ import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.MulticastSocket;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import com.alibaba.dubbo.common.URL;
@ -64,16 +65,21 @@ public class MulticastRegistry extends AbstractRegistry {
mutilcastSocket.joinGroup(mutilcastAddress);
Thread thread = new Thread(new Runnable() {
public void run() {
byte[] buf = new byte[1024];
byte[] buf = new byte[2048];
DatagramPacket recv = new DatagramPacket(buf, buf.length);
while (true) {
try {
mutilcastSocket.receive(recv);
String msg = new String(recv.getData()).trim();
int i = msg.indexOf('\n');
if (i > 0) {
msg = msg.substring(0, i).trim();
}
if (logger.isInfoEnabled()) {
logger.info("Receive multicast message: " + msg + " from " + recv.getSocketAddress());
}
MulticastRegistry.this.receive(msg, (InetSocketAddress) recv.getSocketAddress());
Arrays.fill(buf, (byte)0);
} catch (IOException e) {
logger.error(e.getMessage(), e);
}
@ -140,10 +146,11 @@ public class MulticastRegistry extends AbstractRegistry {
private void broadcast(String msg) {
if (logger.isInfoEnabled()) {
logger.info("Send multicast message: " + msg + " to " + mutilcastAddress + ":" + mutilcastSocket.getLocalPort());
logger.info("Send broadcast message: " + msg + " to " + mutilcastAddress + ":" + mutilcastSocket.getLocalPort());
}
try {
DatagramPacket hi = new DatagramPacket(msg.getBytes(), msg.length(), mutilcastAddress, mutilcastSocket.getLocalPort());
byte[] data = (msg + "\n").getBytes();
DatagramPacket hi = new DatagramPacket(data, data.length, mutilcastAddress, mutilcastSocket.getLocalPort());
mutilcastSocket.send(hi);
} catch (Exception e) {
throw new IllegalStateException(e.getMessage(), e);
@ -152,10 +159,11 @@ public class MulticastRegistry extends AbstractRegistry {
private void unicast(String msg, URL url) {
if (logger.isInfoEnabled()) {
logger.info("Send udp message: " + msg + " to " + url.getAddress());
logger.info("Send unicast message: " + msg + " to " + url.getAddress());
}
try {
DatagramPacket hi = new DatagramPacket(msg.getBytes(), msg.length(), InetAddress.getByName(url.getHost()), mutilcastSocket.getLocalPort());
byte[] data = (msg + "\n").getBytes();
DatagramPacket hi = new DatagramPacket(data, data.length, InetAddress.getByName(url.getHost()), mutilcastSocket.getLocalPort());
mutilcastSocket.send(hi);
} catch (Exception e) {
throw new IllegalStateException(e.getMessage(), e);
@ -189,12 +197,19 @@ public class MulticastRegistry extends AbstractRegistry {
}
public boolean isAvailable() {
return mutilcastSocket.isConnected();
try {
return mutilcastSocket.isConnected();
} catch (Throwable t) {
return false;
}
}
@Override
public void destroy() {
mutilcastSocket.close();
try {
mutilcastSocket.close();
} catch (Throwable t) {
logger.warn(t.getMessage(), t);
}
}
}

1
dubbo-registry-multicast/src/test/java/com/alibaba/dubbo/registry/multicast/MulticastRegistryTest.java
View File

@ -92,7 +92,6 @@ public class MulticastRegistryTest {
*/
@Test
public void testSubscribe() {
final String subscribearg = "arg1=1&arg2=2";
// verify lisener.
final AtomicReference<Map<String, String>> args = new AtomicReference<Map<String, String>>();
registry.subscribe(consumerUrl, new NotifyListener() {