Signed-off-by: Ranjan-Dasgupta <Ranjan.Dasgupta@us.ibm.com>

Ranjan-Dasgupta · icraggs · commit 7c911f0d4c9f · 2020-01-25T12:18:19.000Z
Fix for issue #719 modified: org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/SSLSessionResumptionTest.java modified: org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/CommsReceiver.java
diff --git a/org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/SSLSessionResumptionTest.java b/org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/SSLSessionResumptionTest.java
@@ -82,7 +82,7 @@ public static void setUpBeforeClass() throws Exception {
 	 * 
 	 * @throws Exception
 	 */
-	@Test(timeout=30000)
+	@Test(timeout=60000)
 	public void testSSLSessionInvalidated() throws Exception {
 		 //System.setProperty("javax.net.debug", "all");
 
diff --git a/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/CommsReceiver.java b/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/CommsReceiver.java
@@ -165,7 +165,12 @@ public void run() {
 						if (message != null) {
 							// A new message has arrived
 							clientState.notifyReceivedMsg(message);
-						}
+						}  else {
+                                                    // fix for bug 719
+                                                    if (!clientComms.isConnected()) {
+                                                        throw new MqttException(MqttException.REASON_CODE_CONNECTION_LOST);
+                                                    }
+                                                }
 					}
 				}
 				catch (MqttException ex) {

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public static void setUpBeforeClass() throws Exception {`
`82`	`82`	`*`
`83`	`83`	`* @throws Exception`
`84`	`84`	`*/`
`85`		`- @Test(timeout=30000)`
	`85`	`+ @Test(timeout=60000)`
`86`	`86`	`public void testSSLSessionInvalidated() throws Exception {`
`87`	`87`	`//System.setProperty("javax.net.debug", "all");`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,12 @@ public void run() {`
`165`	`165`	`if (message != null) {`
`166`	`166`	`// A new message has arrived`
`167`	`167`	`clientState.notifyReceivedMsg(message);`
`168`		`- }`
	`168`	`+ } else {`
	`169`	`+ // fix for bug 719`
	`170`	`+ if (!clientComms.isConnected()) {`
	`171`	`+ throw new MqttException(MqttException.REASON_CODE_CONNECTION_LOST);`
	`172`	`+ }`
	`173`	`+ }`
`169`	`174`	`}`
`170`	`175`	`}`
`171`	`176`	`catch (MqttException ex) {`