Fix critical issue introduced by PR #745

Signed-off-by: rdasgupt <ranjan.dasgupta@us.ibm.com>

Author: rdasgupt

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/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;
 		}
 	}