[freenet-cvs] r18009 - trunk/freenet/src/freenet/io/comm

[t...@freenetproject.org]

Author: toad
Date: 2008-02-16 18:58:26 +0000 (Sat, 16 Feb 2008)
New Revision: 18009

Modified:
   trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java
Log:
Store the thread to use isAlive().

Modified: trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java     2008-02-16 
18:55:17 UTC (rev 18008)
+++ trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java     2008-02-16 
18:58:26 UTC (rev 18009)
@@ -44,6 +44,7 @@
        private final int listenPort;
        private final String title;
        private boolean _started;
+       private Thread _thread;

        public UdpSocketHandler(int listenPort, InetAddress bindto, Node node, 
long startupTime, String title) throws SocketException {
                super("UDP packet receiver for "+title, 
NativeThread.MAX_PRIORITY, false);
@@ -90,6 +91,9 @@

        public void run() { // Listen for packets
                super.run();
+               synchronized(this) {
+                       _thread = Thread.currentThread();
+               }
                tracker.startReceive(System.currentTimeMillis());
                try {
                        runLoop();
@@ -125,6 +129,7 @@
                        Logger.error(this, "run() exiting for UdpSocketHandler 
on port "+_sock.getLocalPort());
                        synchronized (this) {
                                _isDone = true;
+                               _thread = null;
                                notifyAll();
                        }
                }
@@ -334,7 +339,7 @@
                                } catch (InterruptedException e) {
                                        // Ignore
                                }
-                               if(UdpSocketHandler.this.isAlive()) {
+                               if(_thread == null || _thread.isAlive()) {
                                        if(logMINOR) Logger.minor(this, "PING 
on "+UdpSocketHandler.this);
                                        long time = System.currentTimeMillis();
                                        int timeSecs = (int) (time / 1000);