Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-04 23:02:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

try to fix assertion by catching null UDP socket

Browse source 
I think there's a rare race condition here. Assuming it results from a
bad network state rather than two sends coming too quickly, respond to
not having a connection by killing the thread so the next send will
retry.
This commit is contained in:
Eric House 2019-05-16 12:23:33 -07:00
parent 107e6d0fca
commit 9b01d044f1
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
View file

@ -360,6 +360,7 @@ public class RelayService extends XWJIService
m_handler = new Handler();
m_onInactivity = new Runnable() {
@Override
public void run() {
// Log.d( TAG, "m_onInactivity fired" );
if ( !shouldMaintainConnection() ) {
@ -733,6 +734,7 @@ public class RelayService extends XWJIService
closeUDPSocket( udpSocket );
service.m_handler.post( new Runnable() {
@Override
public void run() {
service.stopUDPReadThread();
}
@ -811,19 +813,22 @@ public class RelayService extends XWJIService
synchronized ( sUDPReadThreadRef ) {
thread = sUDPReadThreadRef.get();
if ( null == thread ) {
thread = new UDPReadThread();
thread = new UDPReadThread( this );
sUDPReadThreadRef.set( thread );
thread.start();
} else if ( null != s_UDPSocket ) {
thread.setService( this );
} else {
Assert.assertTrue( null != s_UDPSocket || !BuildConfig.DEBUG );
Log.e( TAG, "startUDPReadThreadOnce(): s_UDPSocket NULL" );
stopUDPReadThread();
thread = null;
}
thread.setService( this );
}
} else {
Log.i( TAG, "startUDPThreadsOnce(): UDP disabled" );
Log.i( TAG, "startUDPReadThreadOnce(): UDP disabled" );
}
return thread;
} // startUDPThreadsOnce
} // startUDPReadThreadOnce
private void stopUDPReadThread()
{
@ -1265,7 +1270,10 @@ public class RelayService extends XWJIService
private static class UDPReadThread extends Thread {
private RelayService[] mServiceHolder = {null};
UDPReadThread() { super("UDPReadThread"); }
UDPReadThread( RelayService service ) {
super( "UDPReadThread" );
setService( service );
}
void setService( RelayService service )
{