Merge pull request #2205 from sajinieKavindya/new-master

Check for existence of path separator before removing the last character from registry entryKey

Author: sajinieKavindya

modules/core/src/main/java/org/apache/synapse/unittest/UnitTestMockRegistry.java

@@ -177,17 +177,20 @@ private String getAbsolutePathToRegistry(String key) {
     public Properties getResourceProperties(String entryKey) {
         Properties propertySet = new Properties();
 
-        String filePathAsKey = entryKey.substring(0, entryKey.length() - 1) + ".properties";
-        String resourcePath = getAbsolutePathToRegistry(filePathAsKey);
+        String formattedEntryKey = entryKey;
+        if (entryKey.endsWith(Constants.BACK_SLASH)) {
+            formattedEntryKey = entryKey.substring(0, entryKey.length() - 1);
+        }
+
+        String resourcePath = getAbsolutePathToRegistry(formattedEntryKey + ".properties");
         boolean isFoundPropertyFile = false;
 
         //check registry has .properties file for the properties with key
         if (resourcePath != null && testMockRegistry.containsKey(resourcePath)) {
             isFoundPropertyFile = true;
         } else {
             //check registry has file for the properties with key
-            filePathAsKey = entryKey.substring(0, entryKey.length() - 1);
-            resourcePath = getAbsolutePathToRegistry(filePathAsKey);
+            resourcePath = getAbsolutePathToRegistry(formattedEntryKey);
 
             if (resourcePath != null && testMockRegistry.containsKey(resourcePath)) {
                 isFoundPropertyFile = true;