sdeboy 2003/06/19 07:26:41
Modified: src/java/org/apache/log4j/net MulticastReceiver.java
UDPReceiver.java
Log:
Updated UDPReceiver, MulticastReceiver to support restart.
Revision Changes Path
1.10 +5 -4
jakarta-log4j-sandbox/src/java/org/apache/log4j/net/MulticastReceiver.java
Index: MulticastReceiver.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/net/MulticastReceiver.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MulticastReceiver.java 17 Jun 2003 07:19:59 -0000 1.9
+++ MulticastReceiver.java 19 Jun 2003 14:26:41 -0000 1.10
@@ -84,8 +84,7 @@
//default to log4j xml decoder
private String decoder = "org.apache.log4j.xml.XMLDecoder";
private Decoder decoderImpl;
- private final MulticastReceiverThread receiverThread = new
MulticastReceiverThread();
- private final MulticastHandlerThread handlerThread = new MulticastHandlerThread();
+ private MulticastHandlerThread handlerThread;
public String getDecoder() {
return decoder;
@@ -109,6 +108,7 @@
public synchronized void shutdown() {
isActive = false;
+ socket.close();
}
public void setAddress(String address) {
@@ -151,7 +151,8 @@
try {
socket = new MulticastSocket(port);
socket.joinGroup(addr);
- receiverThread.start();
+ new MulticastReceiverThread().start();
+ handlerThread = new MulticastHandlerThread();
handlerThread.start();
} catch (IOException ioe) {
ioe.printStackTrace();
@@ -226,7 +227,7 @@
String data = new String(p.getData(), 0, p.getLength()).trim();
handlerThread.append(data);
} catch (SocketException se) {
- se.printStackTrace();
+ //disconnected
} catch (IOException ioe) {
ioe.printStackTrace();
}
1.11 +7 -6
jakarta-log4j-sandbox/src/java/org/apache/log4j/net/UDPReceiver.java
Index: UDPReceiver.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/net/UDPReceiver.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- UDPReceiver.java 17 Jun 2003 07:19:59 -0000 1.10
+++ UDPReceiver.java 19 Jun 2003 14:26:41 -0000 1.11
@@ -79,9 +79,8 @@
private Decoder decoderImpl;
private boolean isActive = false;
private int port;
- private DatagramSocket socket = null;
- private final UDPReceiverThread receiverThread = new UDPReceiverThread();
- private final UDPHandlerThread handlerThread = new UDPHandlerThread();
+ private DatagramSocket socket;
+ UDPHandlerThread handlerThread;
public int getPort() {
return port;
@@ -101,6 +100,7 @@
public synchronized void shutdown() {
isActive = false;
+ socket.close();
}
/**
@@ -130,8 +130,9 @@
try {
socket = new DatagramSocket(port);
- receiverThread.start();
- handlerThread.start();
+ new UDPReceiverThread().start();
+ handlerThread = new UDPHandlerThread();
+ handlerThread.start();
} catch (IOException ioe) {
ioe.printStackTrace();
}
@@ -205,7 +206,7 @@
String data = new String(p.getData(), 0, p.getLength()).trim();
handlerThread.append(data);
} catch (SocketException se) {
- se.printStackTrace();
+ //disconnected
} catch (IOException ioe) {
ioe.printStackTrace();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
