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

failing to post a blocking dialog means the jni thread hangs forever.

Browse source 
Bad.  So test if we can post (if the handler's still available) and
drop the request, freeing the thread, if not.  (Access to m_handler
should probably be synchronized now that it's getting cleared, but
that's another bug.)
This commit is contained in:
Andy2 2011-07-29 07:19:33 -07:00
parent 704b08f733
commit 8d9aa5ae0e
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
View file

@ -1257,25 +1257,27 @@ public class BoardActivity extends XWActivity
Utils.logf( "waitBlockingDialog: dropping dlgID %d", dlgID );
} else {
setBlockingThread();
m_resultCode = cancelResult;
post( new Runnable() {
if ( post( new Runnable() {
public void run() {
showDialog( dlgID );
m_blockingDlgPosted = true;
}
} );
} ) ) {
try {
m_forResultWait.acquire();
m_blockingDlgPosted = false;
} catch ( java.lang.InterruptedException ie ) {
Utils.logf( "waitBlockingDialog: got " + ie.toString() );
m_resultCode = cancelResult;
if ( m_blockingDlgPosted ) {
dismissDialog( dlgID );
try {
m_forResultWait.acquire();
m_blockingDlgPosted = false;
} catch ( java.lang.InterruptedException ie ) {
Utils.logf( "waitBlockingDialog: got %s", ie.toString() );
if ( m_blockingDlgPosted ) {
dismissDialog( dlgID );
m_blockingDlgPosted = false;
}
}
}
clearBlockingThread();
result = m_resultCode;
}
@ -1395,13 +1397,15 @@ public class BoardActivity extends XWActivity
}
}
private void post( Runnable runnable )
private boolean post( Runnable runnable )
{
if ( null != m_handler ) {
boolean canPost = null != m_handler;
if ( canPost ) {
m_handler.post( runnable );
} else {
Utils.logf( "post: dropping because handler null" );
}
return canPost;
}
private void postDelayed( Runnable runnable, int when )