Fixed race condition in Android/UDP transport, fixes zeroc-ice#527

mumble-voip · Sep 13, 2019 · 877cb13 · 877cb13
1 parent 712dceb
commit 877cb13
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastClientTransceiver.java b/java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastClientTransceiver.java
@@ -27,7 +27,9 @@ public java.nio.channels.SelectableChannel fd()
     @Override
     public void setReadyCallback(ReadyCallback callback)
     {
+        assert(_readyCallback == null && callback != null);
         _readyCallback = callback;
+        _thread.start();
     }
 
     @Override
@@ -249,7 +251,6 @@ public void run()
                     runWriteThread();
                 }
             };
-            _thread.start();
         }
         catch(Exception ex)
         {

diff --git a/java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastServerTransceiver.java b/java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastServerTransceiver.java
@@ -27,7 +27,14 @@ public java.nio.channels.SelectableChannel fd()
     @Override
     public void setReadyCallback(ReadyCallback callback)
     {
+        assert(_readyCallback == null && callback != null);
         _readyCallback = callback;
+
+        //
+        // Start the thread only once the ready callback is set or otherwise the thread
+        // might start receiving datagrams but wouldn't be able to notify the thread pool.
+        //
+        _thread.start();
     }
 
     @Override
@@ -255,7 +262,6 @@ public void run()
                     runReadThread();
                 }
             };
-            _thread.start();
         }
         catch(Exception ex)
         {

diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpMulticastClientTransceiver.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpMulticastClientTransceiver.java
@@ -27,7 +27,9 @@ public java.nio.channels.SelectableChannel fd()
     @Override
     public void setReadyCallback(ReadyCallback callback)
     {
+        assert(_readyCallback == null && callback != null);
         _readyCallback = callback;
+        _thread.start();
     }
 
     @Override
@@ -249,7 +251,6 @@ public void run()
                     runWriteThread();
                 }
             };
-            _thread.start();
         }
         catch(Exception ex)
         {

diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpMulticastServerTransceiver.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpMulticastServerTransceiver.java
@@ -27,7 +27,14 @@ public java.nio.channels.SelectableChannel fd()
     @Override
     public void setReadyCallback(ReadyCallback callback)
     {
+        assert(_readyCallback == null && callback != null);
         _readyCallback = callback;
+
+        //
+        // Start the thread only once the ready callback is set or otherwise the thread
+        // might start receiving datagrams but wouldn't be able to notify the thread pool.
+        //
+        _thread.start();
     }
 
     @Override
@@ -255,7 +262,6 @@ public void run()
                     runReadThread();
                 }
             };
-            _thread.start();
         }
         catch(Exception ex)
         {