lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into feature_ui_metadata

Browse Source
This commit is contained in:
Michael Hirsch
2016-07-19 19:12:31 +02:00
parent 85e22da7a2 9ac4bbcc54
commit 03fecba57d
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSystemManagement.java
View File

@@ -167,7 +167,6 @@ public class JpaSystemManagement implements CurrentTenantCacheKeyGenerator, Syst
} }
@Override @Override
@Cacheable(value = "tenantMetadata", key = "#tenant.toUpperCase()", cacheManager = "directCacheManager")
@Transactional(isolation = Isolation.READ_UNCOMMITTED) @Transactional(isolation = Isolation.READ_UNCOMMITTED)
@Modifying @Modifying
public TenantMetaData getTenantMetadata(final String tenant) { public TenantMetaData getTenantMetadata(final String tenant) {

4
hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityContextTenantAware.java
View File

@@ -96,7 +96,7 @@ public class SecurityContextTenantAware implements TenantAware {
@Override @Override
public int hashCode() { public int hashCode() {
return (delegate != null) ? delegate.hashCode() : null; return (delegate != null) ? delegate.hashCode() : -1;
} }
@Override @Override
@@ -126,7 +126,7 @@ public class SecurityContextTenantAware implements TenantAware {
@Override @Override
public boolean isAuthenticated() { public boolean isAuthenticated() {
return (delegate != null) ? delegate.isAuthenticated() : null; return (delegate != null) ? delegate.isAuthenticated() : true;
} }
@Override @Override