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

test for null

Browse source 
Was seeing null client in logs. Though NPE was caught and harmless
there's no point in having it thrown.
This commit is contained in:
Eric House 2020-09-13 14:42:35 -07:00
parent 3f6e1a8721
commit 4e7055d629
1 changed files with 31 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
xwords4/android/app/src/main/java/org/eehouse/android/xw4/MQTTUtils.java
View file

@ -366,36 +366,40 @@ public class MQTTUtils extends Thread implements IMqttActionListener, MqttCallba
// you're not subscribed. That can't prevent us from continuing to
// disconnect() and close. Rather than wrap each in its own try/catch,
// run 'em in a loop in a single try/catch.
outer:
for ( int ii = 0; ; ++ii ) {
String action = null;
try {
switch ( ii ) {
case 0:
action = "unsubscribe";
mClient.unsubscribe( mDevID );
break; // not continue, which skips the Log() below
case 1:
action = "disconnect";
mClient.disconnect();
break;
case 2:
action = "close";
mClient.close();
break;
default:
break outer;
if ( null == mClient ) {
Log.e( TAG, "disconnect(): null client" );
} else {
outer:
for ( int ii = 0; ; ++ii ) {
String action = null;
try {
switch ( ii ) {
case 0:
action = "unsubscribe";
mClient.unsubscribe( mDevID );
break; // not continue, which skips the Log() below
case 1:
action = "disconnect";
mClient.disconnect();
break;
case 2:
action = "close";
mClient.close();
break;
default:
break outer;
}
Log.d( TAG, "%H.disconnect(): %s() succeeded", this, action );
} catch ( MqttException mex ) {
Log.e( TAG, "%H.disconnect(): %s(): got mex %s",
this, action, mex );
} catch ( Exception ex ) {
Log.e( TAG, "%H.disconnect(): %s(): got ex %s",
this, action, ex );
}
Log.d( TAG, "%H.disconnect(): %s() succeeded", this, action );
} catch ( MqttException mex ) {
Log.e( TAG, "%H.disconnect(): %s(): got mex %s",
this, action, mex );
} catch ( Exception ex ) {
Log.e( TAG, "%H.disconnect(): %s(): got ex %s",
this, action, ex );
}
mClient = null;
}
mClient = null;
// Make sure we don't need to call clearInstance(this)
synchronized ( sInstance ) {