Merge pull request #584 from alexmantaut/issue-435

Closing FileLock on reconnect() while using MqttDefaultFilePersistence

Author: jpwsutton

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/persist/MqttDefaultFilePersistence.java

@@ -112,6 +112,11 @@ public void open(String clientId, String theConnection) throws MqttPersistenceEx
 			}
 
 			try {
+				//If lock was previously acquired, release before requesting a new one
+				if(fileLock != null){
+					fileLock.release();
+				}
+
 				fileLock = new FileLock(clientDir, LOCK_FILENAME);
 	 		} catch (Exception e) {
 	 			// TODO - This shouldn't be here according to the interface

org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/persist/MqttDefaultFilePersistence.java

@@ -105,6 +105,11 @@ public void open(String clientId) throws MqttPersistenceException {
 			}
 
 			try {
+				//If lock was previously acquired, release before requesting a new one
+				if(fileLock != null){
+					fileLock.release();
+				}
+
 				fileLock = new FileLock(clientDir, LOCK_FILENAME);
 	 		} catch (Exception e) {
 	 			// TODO - This shouldn't be here according to the interface