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

fix NPE: put back setReceiver() call lost when JNIThread became

Browse source 
self-initing.
This commit is contained in:
Eric House 2016-04-09 12:42:47 -07:00
parent 3dd69d90d9
commit 04a697b260
2 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
xwords4/android/XWords4/src/org/eehouse/android/xw4/CommsTransport.java
View file

@ -20,25 +20,23 @@
package org.eehouse.android.xw4;
import android.content.Context;
import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
import java.nio.channels.ClosedChannelException;
import java.nio.channels.SelectionKey;
import java.nio.channels.Selector;
import java.nio.channels.SocketChannel;
import java.nio.channels.SelectionKey;
import java.nio.channels.ClosedChannelException;
import java.nio.channels.UnresolvedAddressException;
import java.nio.ByteBuffer;
import java.net.InetSocketAddress;
import java.util.Vector;
import java.util.Iterator;
import java.util.Vector;
import junit.framework.Assert;
import android.content.Context;
import android.os.Build;
import android.os.Handler;
import android.os.Message;
import org.eehouse.android.xw4.jni.*;
import org.eehouse.android.xw4.jni.JNIThread.*;
import org.eehouse.android.xw4.jni.CurGameInfo.DeviceRole;
import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
import org.eehouse.android.xw4.jni.CurGameInfo.DeviceRole;
import org.eehouse.android.xw4.jni.JNIThread.*;
public class CommsTransport implements TransportProcs,
NetStateCache.StateChangedIf {
@ -49,7 +47,6 @@ public class CommsTransport implements TransportProcs,
private JNIThread m_jniThread;
private CommsThread m_thread;
private TransportProcs.TPMsgHandler m_tpHandler;
private Handler m_handler;
private boolean m_done = false;
private Vector<ByteBuffer> m_buffersOut;
@ -214,10 +211,9 @@ public class CommsTransport implements TransportProcs,
} // loop
}
public void setReceiver( JNIThread jnit, Handler handler )
public void setReceiver( JNIThread jnit )
{
m_jniThread = jnit;
m_handler = handler;
}
public void waitToStop()

3
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
View file

@ -200,7 +200,7 @@ public class JNIThread extends Thread {
String[] dictNames = GameUtils.dictNames( context, m_lock );
DictUtils.DictPairs pairs = DictUtils.openDicts( context, dictNames );
Assert.assertFalse ( pairs.anyMissing( dictNames ) ); // PENDING
Assert.assertFalse( pairs.anyMissing( dictNames ) ); // PENDING
byte[] stream = GameUtils.savedGame( context, m_lock );
Assert.assertNotNull( stream );
@ -213,6 +213,7 @@ public class JNIThread extends Thread {
if ( m_gi.serverRole != DeviceRole.SERVER_STANDALONE ) {
m_xport = new CommsTransport( context, xportHandler, m_rowid,
m_gi.serverRole );
m_xport.setReceiver( this );
}
CommonPrefs cp = CommonPrefs.get( context );