Merge pull request #753 from rdasgupt/fix_718

Fix for topic match issue #718

Author: Ranjan Dasgupta

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

@@ -60,10 +60,18 @@ public void testValidTopicFilterWildcards() throws Exception {
 	public void testMatchedTopicFilterWildcards() throws Exception {
 		String methodName = Utility.getMethodName();
 		LoggingUtilities.banner(log, cclass, methodName);
-		String[][] matchingTopics = new String[][] { { "sport/tennis/player1/#", "sport/tennis/player1" },
-				{ "sport/tennis/player1/#", "sport/tennis/player1/ranking" },
-				{ "sport/tennis/player1/#", "sport/tennis/player1/score/wimbledon" }, { "sport/#", "sport" },
-				{ "#", "sport/tennis/player1" } };
+		String[][] matchingTopics = new String[][] {
+                        { "+/+", "sport/hockey" },
+                        { "/+", "/sport" },
+                        { "sport/tennis/player1/#", "sport/tennis/player1" },
+                        { "sport/tennis/player1/#", "sport/tennis/player1/ranking" },
+                        { "sport/tennis/player1/#", "sport/tennis/player1/score/wimbledon" },
+                        { "sport/#", "sport" },
+                        { "#", "sport/tennis/player1" },
+                        { "sport/tennis/player1/#", "sport/tennis/player1//wimbledon" },
+                        { "sport/+/player1/#", "sport/tennis/player1/wimbledon" },
+                        { "sport/+/player1/#", "sport/soccer/player1/UEFA" }
+                        };
 
 		for (String[] pair : matchingTopics) {
 			Assert.assertTrue(pair[0] + " should match " + pair[1], MqttTopic.isMatched(pair[0], pair[1]));
@@ -74,8 +82,15 @@ public void testMatchedTopicFilterWildcards() throws Exception {
 	public void testNonMatchedTopicFilterWildcards() throws Exception {
 		String methodName = Utility.getMethodName();
 		LoggingUtilities.banner(log, cclass, methodName);
-		String[][] matchingTopics = new String[][] { { "sport/tennis/player1/#", "sport/tennis/player2" },
-				{ "sport1/#", "sport2" }, { "sport/tennis1/player/#", "sport/tennis2/player" } };
+		String[][] matchingTopics = new String[][] {
+                        { "+/+", "/sport" },
+                        { "+/+", "a/b/c" },
+                        { "/sport/+", "/sport/" },
+                        { "sport/tennis/player1/#", "sport/tennis/player2" },
+                        { "sport1/#", "sport2" },
+                        { "sport/tennis1/player/#", "sport/tennis2/player" },
+                        { "sport//tennis/player1/#", "sport/tennis/player1//wimbledon" }
+                        };
 
 		for (String[] pair : matchingTopics) {
 			Assert.assertFalse(pair[0] + " should NOT match " + pair[1], MqttTopic.isMatched(pair[0], pair[1]));

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

@@ -275,6 +275,9 @@ public static boolean isMatched(String topicFilter, String topicName) throws Ill
 		}
 
 		while (filterPos < filterLen && topicPos < topicLen) {
+                        if (topicFilter.charAt(filterPos) == '#')
+                                topicPos = topicLen - 1; // skip until end of string
+
 			if (topicName.charAt(topicPos) == '/' && topicFilter.charAt(filterPos) != '/')
 
 				break;
@@ -285,8 +288,8 @@ public static boolean isMatched(String topicFilter, String topicName) throws Ill
 				int nextpos = topicPos + 1;
 				while (nextpos < topicLen && topicName.charAt(nextpos) != '/')
 					nextpos = ++topicPos + 1;
-			} else if (topicFilter.charAt(filterPos) == '#')
-				topicPos = topicLen - 1; // skip until end of string
+			}
+
 			filterPos++;
 			topicPos++;
 		}