Browse Source
Merge branch 'master' into improvement/4193-gateway-config-advanced
pull/11462/head
Max Petrov
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
3 additions and
3 deletions
-
common/cache/src/main/java/org/thingsboard/server/cache/TbTransactionalCache.java
-
ui-ngx/src/app/core/services/menu.models.ts
|
|
|
@ -53,7 +53,7 @@ public interface TbTransactionalCache<K extends Serializable, V extends Serializ |
|
|
|
if (putToCache) { |
|
|
|
return getAndPutInTransaction(key, dbCall, cacheNullValue); |
|
|
|
} else { |
|
|
|
TbCacheValueWrapper<V> cacheValueWrapper = get(key); |
|
|
|
TbCacheValueWrapper<V> cacheValueWrapper = get(key, true); |
|
|
|
if (cacheValueWrapper != null) { |
|
|
|
return cacheValueWrapper.get(); |
|
|
|
} |
|
|
|
@ -92,7 +92,7 @@ public interface TbTransactionalCache<K extends Serializable, V extends Serializ |
|
|
|
if (putToCache) { |
|
|
|
return getAndPutInTransaction(key, dbCall, cacheValueToResult, dbValueToCacheValue, cacheNullValue); |
|
|
|
} else { |
|
|
|
TbCacheValueWrapper<V> cacheValueWrapper = get(key); |
|
|
|
TbCacheValueWrapper<V> cacheValueWrapper = get(key, true); |
|
|
|
if (cacheValueWrapper != null) { |
|
|
|
var cacheValue = cacheValueWrapper.get(); |
|
|
|
return cacheValue == null ? null : cacheValueToResult.apply(cacheValue); |
|
|
|
|
|
|
|
@ -76,7 +76,7 @@ export enum MenuId { |
|
|
|
mobile_app_settings = 'mobile_app_settings', |
|
|
|
security_settings = 'security_settings', |
|
|
|
security_settings_general = 'security_settings_general', |
|
|
|
two_fa = '2fa', |
|
|
|
two_fa = 'two_fa', |
|
|
|
oauth2 = 'oauth2', |
|
|
|
audit_log = 'audit_log', |
|
|
|
alarms = 'alarms', |
|
|
|
|
