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

fix npe sending relay invites to self

Browse source 
Needed to handle the case where both are null. Can't reproduce this in
release builds so likely doesn't justify a new release.
This commit is contained in:
Eric House 2019-05-21 13:18:27 -07:00
parent b63ba3e843
commit 78f1ba6dde
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWJIService.java
View file

@ -204,7 +204,14 @@ abstract class XWJIService extends JobIntentService {
Object obj1 = bundle1.get( key ); Object obj1 = bundle1.get( key );
Object obj2 = bundle2.get( key ); Object obj2 = bundle2.get( key );
if ( obj1.getClass() != obj2.getClass() ) { if ( obj1 == obj2 ) { // catches case where both null
continue;
} else if ( obj1 == null || obj2 == null ) {
equal = false;
break;
}
if ( obj1.getClass() != obj2.getClass() ) { // NPE
equal = false; equal = false;
break; break;
} }