* [4999935] Add optional flag to forcibly disconnect without sending the disconnect packet to trigger LW message. (#246)

ref: https://bugs.eclipse.org/bugs/show_bug.cgi?id=499935

Signed-off-by: Matt Pavlovich <mattrpav@gmail.com>

Author: Matt Pavlovich

org.eclipse.paho.client.mqttv3/src/main/java-templates/org/eclipse/paho/client/mqttv3/internal/ClientComms.java

@@ -471,20 +471,26 @@ public void disconnect(MqttDisconnect disconnect, long quiesceTimeout, MqttToken
 			discbg.start();
 		}
 	}
-	
+
+        public void disconnectForcibly(long quiesceTimeout, long disconnectTimeout) throws MqttException {
+		disconnectForcibly(quiesceTimeout, disconnectTimeout, true);
+	}	
+
 	/**
 	 * Disconnect the connection and reset all the states.
 	 */
-	public void disconnectForcibly(long quiesceTimeout, long disconnectTimeout) throws MqttException {
+	public void disconnectForcibly(long quiesceTimeout, long disconnectTimeout, boolean sendDisconnectPacket) throws MqttException {
 		// Allow current inbound and outbound work to complete
 		clientState.quiesce(quiesceTimeout);
 		MqttToken token = new MqttToken(client.getClientId());
 		try {
 			// Send disconnect packet
-			internalSend(new MqttDisconnect(), token);
+			if(sendDisconnectPacket) {
+				internalSend(new MqttDisconnect(), token);
 
-			// Wait util the disconnect packet sent with timeout
-			token.waitForCompletion(disconnectTimeout);
+				// Wait util the disconnect packet sent with timeout
+				token.waitForCompletion(disconnectTimeout);
+			}
 		}
 		catch (Exception ex) {
 			// ignore, probably means we failed to send the disconnect packet.

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/MqttAsyncClient.java

@@ -649,6 +649,10 @@ public void disconnectForcibly(long quiesceTimeout, long disconnectTimeout) thro
 		comms.disconnectForcibly(quiesceTimeout, disconnectTimeout);
 	}
 
+        public void disconnectForcibly(long quiesceTimeout, long disconnectTimeout, boolean sendDisconnectPacket) throws MqttException {
+                comms.disconnectForcibly(quiesceTimeout, disconnectTimeout, sendDisconnectPacket);
+        }
+
 	/* (non-Javadoc)
 	 * @see IMqttAsyncClient#isConnected()
 	 */

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/MqttClient.java

@@ -290,6 +290,10 @@ public void disconnectForcibly(long quiesceTimeout, long disconnectTimeout) thro
 		aClient.disconnectForcibly(quiesceTimeout, disconnectTimeout);
 	}
 
+        public void disconnectForcibly(long quiesceTimeout, long disconnectTimeout, boolean sendDisconnectPacket) throws MqttException {
+                aClient.disconnectForcibly(quiesceTimeout, disconnectTimeout, sendDisconnectPacket);
+        }
+
 	/*
 	 * @see IMqttClient#subscribe(String)
 	 */