Merge pull request #948 from eclipse/develop

Merge develop to master

Author: Ranjan Dasgupta

org.eclipse.paho.client.mqttv3.internal.traceformat/build.xml

@@ -8,8 +8,8 @@
 	<!-- classpath.folder = ship.folder of org.eclipse.paho.client.mqttv3 build.xml -->
 	<property name="classpath.folder" value="../org.eclipse.paho.client.mqttv3/target/ship" />
 
-	<property name="client.release.version" value="1.2.5" />
-	<property name="bundleVersion" value="1.2.5" />
+	<property name="client.release.version" value="1.2.6" />
+	<property name="bundleVersion" value="1.2.6" />
 
 	<property name="bundleVendor" value="Eclipse.org" />
 	<property name="build.level" value="LYYMMDD" />

org.eclipse.paho.client.mqttv3.repository/category.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-	<bundle id="org.eclipse.paho.client.mqttv3" version="1.2.5">
+	<bundle id="org.eclipse.paho.client.mqttv3" version="1.2.6">
 		<category name="Paho MQTT Java"/>
 	</bundle>
 	<category-def name="Paho MQTT Java" label="Paho MQTT Java">

org.eclipse.paho.client.mqttv3.repository/pom.xml

@@ -3,11 +3,11 @@
     <parent>
         <groupId>org.eclipse.paho</groupId>
         <artifactId>java-parent</artifactId>
-        <version>1.2.5</version>
+        <version>1.2.6</version>
     </parent>
 
     <artifactId>org.eclipse.paho.client.mqttv3.repository</artifactId>
-    <version>1.2.5</version>
+    <version>1.2.6</version>
     <packaging>eclipse-repository</packaging>
 
     <name>Paho P2 Repository for mqttv3 client</name>

org.eclipse.paho.client.mqttv3.test/pom.xml

@@ -4,11 +4,11 @@
 	<parent>
 		<groupId>org.eclipse.paho</groupId>
 		<artifactId>java-parent</artifactId>
-		<version>1.2.5</version>
+		<version>1.2.6</version>
 	</parent>
 
 	<artifactId>org.eclipse.paho.client.mqttv3.test</artifactId>
-        <version>1.2.5</version>
+        <version>1.2.6</version>
 	<packaging>jar</packaging>
 
 	<build>
@@ -87,7 +87,7 @@
 		<dependency>
 			<groupId>org.eclipse.paho</groupId>
 			<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
-			<version>1.2.5</version>
+			<version>1.2.6</version>
 		</dependency>
 
 		<dependency>

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/MqttDataTypesTest.java

@@ -1,7 +1,6 @@
 package org.eclipse.paho.client.mqttv3.test;
 
 import java.io.*;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 
 import org.eclipse.paho.client.mqttv3.MqttException;
@@ -72,6 +71,25 @@ public void TestEncodeInvalidUTF8StringInDifferentRange() throws MqttException {
 		encodeAndDecodeString(invalidString);
 	}
 
+	@Test
+	public void TestEncodeAndDecodeUTF8StringWithSurrogates() throws MqttException {
+		String testString = "\uD801\uDC37";
+		String decodedUTF8 = encodeAndDecodeString(testString);
+		Assert.assertEquals(testString, decodedUTF8);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void TestEncodeAndDecodeUTF8StringWithTrailingHighSurrogate() throws MqttException {
+		String testString = "\uD801";
+		encodeAndDecodeString(testString);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void TestEncodeAndDecodeUTF8StringWithLowSurrogate() throws MqttException {
+		String testString = "\uDC37";
+		encodeAndDecodeString(testString);
+	}
+
 	@Test
 	public void TestEncodeAndDecodeUTF8String() throws MqttException {
 		String testString = "Answer to life the universe and everything";
@@ -91,14 +109,11 @@ public void TestEncodeAndDecodeChineseUTF8String() throws MqttException {
 
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void TestEncodeAndDecodeEmojiString() throws MqttException {
 		String testString = "👁🐝Ⓜ️️";
-		// System.out.println(String.format("'%s' is %d bytes, %d chars long",
-		// testString, testString.getBytes().length, testString.length()));
 		String decodedUTF8 = encodeAndDecodeString(testString);
 		Assert.assertEquals(testString, decodedUTF8);
-
 	}
 
 	@Test

org.eclipse.paho.client.mqttv3/META-INF/MANIFEST.MF

@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.paho.client.mqttv3
 Bundle-SymbolicName: org.eclipse.paho.client.mqttv3
-Bundle-Version: 1.2.5
+Bundle-Version: 1.2.6
 Bundle-Localization: bundle
-Export-Package: org.eclipse.paho.client.mqttv3;version="1.2.5",
- org.eclipse.paho.client.mqttv3.logging;version="1.2.5",
- org.eclipse.paho.client.mqttv3.persist;version="1.2.5",
- org.eclipse.paho.client.mqttv3.util;version="1.2.5"
+Export-Package: org.eclipse.paho.client.mqttv3;version="1.2.6",
+ org.eclipse.paho.client.mqttv3.logging;version="1.2.6",
+ org.eclipse.paho.client.mqttv3.persist;version="1.2.6",
+ org.eclipse.paho.client.mqttv3.util;version="1.2.6"
 Bundle-Vendor: %bundle.provider
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7

org.eclipse.paho.client.mqttv3/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.eclipse.paho</groupId>
         <artifactId>java-parent</artifactId>
-        <version>1.2.5</version>
+        <version>1.2.6</version>
     </parent>
 
     <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
@@ -133,6 +133,6 @@
             </plugins>
         </pluginManagement>
     </build>
-    <version>1.2.5</version>
+    <version>1.2.6</version>
 </project>
 

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

@@ -186,7 +186,9 @@ public void sendNoWait(MqttWireMessage message, MqttToken token) throws MqttExce
 				//@TRACE 507=Client Connected, Offline Buffer available, but not empty. Adding message to buffer. message={0}
 				log.fine(CLASS_NAME, methodName, "507", new Object[] {message.getKey()});
 				if(disconnectedMessageBuffer.isPersistBuffer()){
-					this.clientState.persistBufferedMessage(message);
+					if (message instanceof MqttPublish) {
+						this.clientState.persistBufferedMessage(message);
+					}
 				}
 				disconnectedMessageBuffer.putMessage(message, token);
 			} else {

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

@@ -313,6 +313,21 @@ public interface IMqttAsyncClient extends AutoCloseable {
 	 */
     void disconnectForcibly(long quiesceTimeout, long disconnectTimeout) throws MqttException;
 
+	/**
+	 * Disconnects from the server forcibly to reset all the states. Could be
+	 * useful when disconnect attempt failed.
+	 * <p>
+	 * Because the client is able to establish the TCP/IP connection to a none
+	 * MQTT server and it will certainly fail to send the disconnect packet.
+	 *
+	 * @param quiesceTimeout the amount of time in milliseconds to allow for existing work
+	 * to finish before disconnecting. A value of zero or less means the client will not quiesce.
+	 * @param disconnectTimeout the amount of time in milliseconds to allow send disconnect packet to server.
+	 * @param sendDisconnectPacket if true, will send the disconnect packet to the server
+	 * @throws MqttException if any unexpected error
+	 */
+    public void disconnectForcibly(long quiesceTimeout, long disconnectTimeout, boolean sendDisconnectPacket) throws MqttException;
+
 	/**
 	 * Determines if this client is currently connected to the server.
 	 *

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

@@ -857,24 +857,11 @@ public void disconnectForcibly(long quiesceTimeout, long disconnectTimeout) thro
 		comms.disconnectForcibly(quiesceTimeout, disconnectTimeout);
 	}
 
-	/**
-	 * Disconnects from the server forcibly to reset all the states. Could be
-	 * useful when disconnect attempt failed.
-	 * <p>
-	 * Because the client is able to establish the TCP/IP connection to a none
-	 * MQTT server and it will certainly fail to send the disconnect packet.
-	 *
-	 * @param quiesceTimeout
-	 *            the amount of time in milliseconds to allow for existing work
-	 *            to finish before disconnecting. A value of zero or less means
-	 *            the client will not quiesce.
-	 * @param disconnectTimeout
-	 *            the amount of time in milliseconds to allow send disconnect
-	 *            packet to server.
-	 * @param sendDisconnectPacket
-	 *            if true, will send the disconnect packet to the server
-	 * @throws MqttException
-	 *             if any unexpected error
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.paho.client.mqttv3.IMqttAsyncClient#disconnectForcibly(long, long, boolean)
 	 */
 	public void disconnectForcibly(long quiesceTimeout, long disconnectTimeout, boolean sendDisconnectPacket)
 			throws MqttException {