Fixing Logging in DisconnectedMessageBuffer where the incorrect message was being shown.

Signed-off-by: James Sutton <james.sutton@uk.ibm.com>

Author: jpwsutton

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/DisconnectedMessageBuffer.java

@@ -30,13 +30,13 @@ public class DisconnectedMessageBuffer implements Runnable {
 	private static final String CLASS_NAME = "DisconnectedMessageBuffer";
 	private Logger log = LoggerFactory.getLogger(LoggerFactory.MQTT_CLIENT_MSG_CAT, CLASS_NAME);
 	private DisconnectedBufferOptions bufferOpts;
-	private ArrayList buffer;
+	private ArrayList<BufferedMessage> buffer;
 	private Object	bufLock = new Object();  	// Used to synchronise the buffer
 	private IDisconnectedBufferCallback callback;
 
 	public DisconnectedMessageBuffer(DisconnectedBufferOptions options){
 		this.bufferOpts = options;
-		buffer = new ArrayList();
+		buffer = new ArrayList<BufferedMessage>();
 	}
 
 	/**
@@ -110,8 +110,8 @@ public void run() {
 				deleteMessage(0);
 				} catch (MqttException ex) {
 					// Error occurred attempting to publish buffered message likely because the client is not connected
-					// @TRACE 517=Error occurred attempting to publish buffered message due to disconnect.
-					log.warning(CLASS_NAME, methodName, "517");
+					// @TRACE 519=Error occurred attempting to publish buffered message due to disconnect. Exception: {0}.
+					log.warning(CLASS_NAME, methodName, "519", new Object[]{ex.getMessage()});
 					break;
 				}
 			}

org.eclipse.paho.client.mqttv3/src/main/resources/org/eclipse/paho/client/mqttv3/internal/nls/logcat.properties

@@ -80,6 +80,7 @@
 516=Restoring all buffered messages.
 517=Un-Persisting Buffered message key={0}
 518=Failed to Un-Persist Buffered message key={0}
+519=Error occurred attempting to publish buffered message due to disconnect. Exception: {0}.
 529=Sent {0}
 600=>
 601=key={0} message={1}

org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/DisconnectedMessageBuffer.java

@@ -111,8 +111,8 @@ public void run() {
 				deleteMessage(0);
 				} catch (MqttException ex) {
 					// Error occurred attempting to publish buffered message likely because the client is not connected
-					// @TRACE 517=Error occurred attempting to publish buffered message due to disconnect.
-					log.warning(CLASS_NAME, methodName, "517");
+					// @TRACE 519=Error occurred attempting to publish buffered message due to disconnect. Exception: {0}.
+					log.warning(CLASS_NAME, methodName, "519", new Object[]{ex.getMessage()});
 					break;
 				}
 			}

org.eclipse.paho.mqttv5.client/src/main/resources/org/eclipse/paho/mqttv5/client/internal/nls/logcat.properties

@@ -80,6 +80,7 @@
 516=Restoring all buffered messages.
 517=Un-Persisting Buffered message key={0}
 518=Failed to Un-Persist Buffered message key={0}
+519=Error occurred attempting to publish buffered message due to disconnect. Exception: {0}.
 529=Sent {0}
 530=Received {0}
 600=>