mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-07 05:24:46 +01:00
fix npe sending relay invites to self
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:
parent
b63ba3e843
commit
78f1ba6dde
1 changed files with 8 additions and 1 deletions
|
@ -204,7 +204,14 @@ abstract class XWJIService extends JobIntentService {
|
|||
|
||||
Object obj1 = bundle1.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;
|
||||
break;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue