Improve unique resource key generation

2 years ago · 25ae3de962
1 changed files with 1 additions and 1 deletions
--- a/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java
@ -163,7 +163,7 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
        String resourceKey = filename;
        int idx = 1;
        while (existing.contains(resourceKey)) {
-            resourceKey = basename + "_(" + idx + ")." + extension;
+            resourceKey = basename + "_(" + idx + ")" + (!extension.isEmpty() ? "." + extension : "");
            idx++;
        }
        log.debug("[{}] Generated unique key {} for {} {}", tenantId, resourceKey, resourceType, filename);