Update receivers to set the 'active' member on activateoptions & shutdown
git-svn-id: https://svn.apache.org/repos/asf/logging/log4j/companions/receivers/trunk@966516 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/log4j/net/MulticastReceiver.java b/src/main/java/org/apache/log4j/net/MulticastReceiver.java
index 8df11ba..2dfcec2 100644
--- a/src/main/java/org/apache/log4j/net/MulticastReceiver.java
+++ b/src/main/java/org/apache/log4j/net/MulticastReceiver.java
@@ -44,7 +44,6 @@
public class MulticastReceiver extends Receiver implements PortBased,
AddressBased, Pauseable {
private static final int PACKET_LENGTH = 16384;
- private boolean isActive = false;
private int port;
private String address;
private String encoding;
@@ -100,7 +99,7 @@
}
public synchronized void shutdown() {
- isActive = false;
+ active = false;
if (advertiseViaMulticastDNS) {
zeroConf.unadvertise();
}
@@ -152,7 +151,7 @@
}
try {
- isActive = true;
+ active = true;
socket = new MulticastSocket(port);
socket.joinGroup(addr);
receiverThread = new MulticastReceiverThread();
@@ -246,12 +245,12 @@
}
public void run() {
- isActive = true;
+ active = true;
byte[] b = new byte[PACKET_LENGTH];
DatagramPacket p = new DatagramPacket(b, b.length);
- while (isActive) {
+ while (active) {
try {
socket.receive(p);
diff --git a/src/main/java/org/apache/log4j/net/UDPReceiver.java b/src/main/java/org/apache/log4j/net/UDPReceiver.java
index 63eb275..a8c7375 100644
--- a/src/main/java/org/apache/log4j/net/UDPReceiver.java
+++ b/src/main/java/org/apache/log4j/net/UDPReceiver.java
@@ -112,6 +112,7 @@
return;
}
closed = true;
+ active = false;
// Closing the datagram socket will unblock the UDPReceiverThread if it is
// was waiting to receive data from the socket.
if (socket != null) {
@@ -166,7 +167,7 @@
zeroConf = new ZeroConfSupport(ZONE, port, getName());
zeroConf.advertise();
}
-
+ active = true;
} catch (IOException ioe) {
ioe.printStackTrace();
}
diff --git a/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java b/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java
index fe18758..cd37dc4 100644
--- a/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java
+++ b/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java
@@ -51,7 +51,6 @@
*/
public class XMLSocketReceiver extends Receiver implements Runnable, PortBased, Pauseable {
- protected boolean active = false;
private boolean paused;
//default to log4j xml decoder
protected String decoder = "org.apache.log4j.xml.XMLDecoder";
