Author: sdeboy
Date: Tue Jun 15 07:16:28 2010
New Revision: 954727
URL: http://svn.apache.org/viewvc?rev=954727&view=rev
Log:
Clarify configuration options on NoReceiversWarningPanel dialog
prevent NPE in multicastreceiver
Modified:
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/net/MulticastReceiver.java
Modified:
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/net/MulticastReceiver.java
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/net/MulticastReceiver.java?rev=954727&r1=954726&r2=954727&view=diff
==============================================================================
---
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/net/MulticastReceiver.java
(original)
+++
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/net/MulticastReceiver.java
Tue Jun 15 07:16:28 2010
@@ -17,23 +17,21 @@
package org.apache.log4j.net;
-import org.apache.log4j.plugins.Pauseable;
-import org.apache.log4j.plugins.Receiver;
-import org.apache.log4j.spi.Decoder;
-import org.apache.log4j.spi.LoggingEvent;
-
import java.io.IOException;
-
import java.net.DatagramPacket;
import java.net.InetAddress;
import java.net.MulticastSocket;
import java.net.SocketException;
import java.net.UnknownHostException;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.apache.log4j.plugins.Pauseable;
+import org.apache.log4j.plugins.Receiver;
+import org.apache.log4j.spi.Decoder;
+import org.apache.log4j.spi.LoggingEvent;
+
/**
* Multicast-based receiver. Accepts LoggingEvents encoded using
@@ -106,9 +104,15 @@ public class MulticastReceiver extends R
if (advertiseViaMulticastDNS) {
zeroConf.unadvertise();
}
- handlerThread.interrupt();
- receiverThread.interrupt();
- socket.close();
+ if (handlerThread != null) {
+ handlerThread.interrupt();
+ }
+ if (receiverThread != null) {
+ receiverThread.interrupt();
+ }
+ if (socket != null) {
+ socket.close();
+ }
}
public void setAddress(String address) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
