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

fix NPE when relay's re-added to a game

Browse source
This commit is contained in:
Eric House 2016-06-30 06:21:12 -07:00
parent 03492b97e8
commit a243b19fd0
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommsAddrRec.java
View file

@ -289,9 +289,10 @@ public class CommsAddrRec {
CommsConnType conType = iter.next(); CommsConnType conType = iter.next();
switch( conType ) { switch( conType ) {
case COMMS_CONN_RELAY: case COMMS_CONN_RELAY:
matter = ! ip_relay_invite.equals( other.ip_relay_invite ) matter = null == ip_relay_invite
|| ! ip_relay_hostName.equals( other.ip_relay_hostName ) || ! ip_relay_invite.equals( other.ip_relay_invite )
|| ip_relay_port != other.ip_relay_port; || ! ip_relay_hostName.equals( other.ip_relay_hostName )
|| ip_relay_port != other.ip_relay_port;
break; break;
default: default:
DbgUtils.logf( "changesMatter: not handling case: %s", DbgUtils.logf( "changesMatter: not handling case: %s",