Merge pull request #769 from eclipse/develop

Develop

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.3" />
-	<property name="bundleVersion" value="1.2.3" />
+	<property name="client.release.version" value="1.2.4.qualifier" />
+	<property name="bundleVersion" value="1.2.4.qualifier" />
 
 	<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.3">
+	<bundle id="org.eclipse.paho.client.mqttv3" version="1.2.4.qualifier">
 		<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.3</version>
+		<version>1.2.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.paho.client.mqttv3.repository</artifactId>
-            <version>1.2.3</version>
+  <version>1.2.4-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 
 	<name>Paho P2 Repository</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.3</version>
+		<version>1.2.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.paho.client.mqttv3.test</artifactId>
-                <version>1.2.3</version>
+                <version>1.2.4-SNAPSHOT</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.3</version>
+			<version>1.2.4-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>

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

@@ -127,7 +127,7 @@ public void testICanEatGlass() throws IOException, MqttException {
 		try {
 			decodedFileName = java.net.URLDecoder.decode( encodedFileName, StandardCharsets.UTF_8.name() );
 		}
-		catch ( UnsupportedEncodingException e ) {
+		catch ( Exception e ) {
 			// can't decode the URL, passing on the encoded name hoping that it
 			// actually contains something that exists in the filesystem with
 			// that name.

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/properties/TestProperties.java

@@ -338,7 +338,7 @@ public static String getClientKeyStore() {
     try {
       return java.net.URLDecoder.decode( encodedPath, StandardCharsets.UTF_8.name());
     }
-    catch (UnsupportedEncodingException e ) {
+    catch (Exception e ) {
       // likely the property value is malformed. Return it as is, hoping that
       // the requester knows what to make of it.
       return encodedPath;

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

@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundle.name
 Bundle-SymbolicName: org.eclipse.paho.client.mqttv3
-Bundle-Version: 1.2.3
+Bundle-Version: 1.2.4.qualifier
 Bundle-Localization: bundle
-Export-Package: org.eclipse.paho.client.mqttv3;version="1.2.3",
- org.eclipse.paho.client.mqttv3.logging;version="1.2.3",
- org.eclipse.paho.client.mqttv3.persist;version="1.2.3",
- org.eclipse.paho.client.mqttv3.util;version="1.2.3"
+Export-Package: org.eclipse.paho.client.mqttv3;version="1.2.4.qualifier",
+ org.eclipse.paho.client.mqttv3.logging;version="1.2.4.qualifier",
+ org.eclipse.paho.client.mqttv3.persist;version="1.2.4.qualifier",
+ org.eclipse.paho.client.mqttv3.util;version="1.2.4.qualifier"
 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.3</version>
+		<version>1.2.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
@@ -133,5 +133,5 @@
 			</plugins>
 		</pluginManagement>
 	</build>
-        <version>1.2.3</version>
+        <version>1.2.4-SNAPSHOT</version>
 </project>

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

@@ -465,7 +465,7 @@ private MqttToken handleOldTokens(MqttToken token, MqttException reason) {
 			// First the token that was related to the disconnect / shutdown may
 			// not be in the token table - temporarily add it if not
 			if (token != null) {
-				if (tokenStore.getToken(token.internalTok.getKey())==null) {
+				if (!token.isComplete() && tokenStore.getToken(token.internalTok.getKey())==null) {
 					tokenStore.saveToken(token, token.internalTok.getKey());
 				}
 			}

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/security/SSLSocketFactoryFactory.java

@@ -1012,7 +1012,8 @@ public String getTrustStore(String configID) {
 			String decodedPath = java.net.URLDecoder.decode( encodedPath, StandardCharsets.UTF_8.name());
 			return decodedPath;
 		}
-		catch( UnsupportedEncodingException e ) {
+		catch( Exception e ) {
+                        // To maintain backword compatibility, return encodedPath for any exception
 			return encodedPath;
 		}
 	}