TCF Debugger: improved model deltas generation logic

1 files changed, 24 insertions, 18 deletions

diff --git a/plugins/org.eclipse.tm.tcf.core/src/org/eclipse/tm/internal/tcf/services/local/LocatorService.java b/plugins/org.eclipse.tm.tcf.core/src/org/eclipse/tm/internal/tcf/services/local/LocatorService.java
index ffaf21900..03a940fcb 100644
--- a/plugins/org.eclipse.tm.tcf.core/src/org/eclipse/tm/internal/tcf/services/local/LocatorService.java
+++ b/plugins/org.eclipse.tm.tcf.core/src/org/eclipse/tm/internal/tcf/services/local/LocatorService.java
@@ -233,26 +233,32 @@ public class LocatorService implements ILocator {
 
     private final Thread input_thread = new Thread() {
         public void run() {
-            for (;;) {
-                DatagramSocket socket = LocatorService.this.socket;
-                try {
-                    final DatagramPacket p = new DatagramPacket(inp_buf, inp_buf.length);
-                    socket.receive(p);
-                    Protocol.invokeAndWait(new Runnable() {
-                        public void run() {
-                            handleDatagramPacket(p);
-                        }
-                    });
-                }
-                catch (IllegalStateException x) {
-                    // TCF event dispatch is shutdown
-                    return;
-                }
-                catch (Exception x) {
-                    if (socket != LocatorService.this.socket) continue;
-                    log("Cannot read from datagram socket at port " + socket.getLocalPort(), x);
+            try {
+                for (;;) {
+                    DatagramSocket socket = LocatorService.this.socket;
+                    try {
+                        final DatagramPacket p = new DatagramPacket(inp_buf, inp_buf.length);
+                        socket.receive(p);
+                        Protocol.invokeAndWait(new Runnable() {
+                            public void run() {
+                                handleDatagramPacket(p);
+                            }
+                        });
+                    }
+                    catch (IllegalStateException x) {
+                        // TCF event dispatch is shutdown
+                        return;
+                    }
+                    catch (Exception x) {
+                        if (socket != LocatorService.this.socket) continue;
+                        log("Cannot read from datagram socket at port " + socket.getLocalPort(), x);
+                        sleep(2000);
+                    }
                 }
             }
+            catch (Throwable x) {
+                log("Unhandled exception in socket reading thread", x);
+            }
         }
     };