Merge "Fix Bug 475639 - Added null checks" into develop

Ian Craggs · Gerrit Code Review @ Eclipse.org · commit 7bd006872b35 · 2015-08-25T15:27:51.000-04:00
diff --git a/org.eclipse.paho.android.service/org.eclipse.paho.android.service/src/org/eclipse/paho/android/service/MqttConnection.java b/org.eclipse.paho.android.service/org.eclipse.paho.android.service/src/org/eclipse/paho/android/service/MqttConnection.java
@@ -414,7 +414,7 @@ void disconnect(long quiesceTimeout, String invocationContext,
 			service.callbackToActivity(clientHandle, Status.ERROR, resultBundle);
 		}
 
-		if (connectOptions.isCleanSession()) {
+		if (connectOptions != null && connectOptions.isCleanSession()) {
 			// assume we'll clear the stored messages at this point
 			service.messageStore.clearArrivedMessages(clientHandle);
 		}
@@ -457,7 +457,7 @@ void disconnect(String invocationContext, String activityToken) {
 			service.callbackToActivity(clientHandle, Status.ERROR, resultBundle);
 		}
 
-		if (connectOptions.isCleanSession()) {
+		if (connectOptions != null && connectOptions.isCleanSession()) {
 			// assume we'll clear the stored messages at this point
 			service.messageStore.clearArrivedMessages(clientHandle);
 		}

Original file line number	Diff line number	Diff line change
`@@ -414,7 +414,7 @@ void disconnect(long quiesceTimeout, String invocationContext,`
`414`	`414`	`service.callbackToActivity(clientHandle, Status.ERROR, resultBundle);`
`415`	`415`	`}`
`416`	`416`
`417`		`- if (connectOptions.isCleanSession()) {`
	`417`	`+ if (connectOptions != null && connectOptions.isCleanSession()) {`
`418`	`418`	`// assume we'll clear the stored messages at this point`
`419`	`419`	`service.messageStore.clearArrivedMessages(clientHandle);`
`420`	`420`	`}`
`@@ -457,7 +457,7 @@ void disconnect(String invocationContext, String activityToken) {`
`457`	`457`	`service.callbackToActivity(clientHandle, Status.ERROR, resultBundle);`
`458`	`458`	`}`
`459`	`459`
`460`		`- if (connectOptions.isCleanSession()) {`
	`460`	`+ if (connectOptions != null && connectOptions.isCleanSession()) {`
`461`	`461`	`// assume we'll clear the stored messages at this point`
`462`	`462`	`service.messageStore.clearArrivedMessages(clientHandle);`
`463`	`463`	`}`