From d1c889bf160951b800d9c3d3042e4489b39c53d7 Mon Sep 17 00:00:00 2001 From: Michael Hirsch Date: Tue, 19 Jul 2016 15:51:22 +0200 Subject: [PATCH 1/2] don't return null on isAuthenticated method is boolean Signed-off-by: Michael Hirsch --- .../eclipse/hawkbit/security/SecurityContextTenantAware.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityContextTenantAware.java b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityContextTenantAware.java index e67faa739..f2cfbbdbf 100644 --- a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityContextTenantAware.java +++ b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityContextTenantAware.java @@ -96,7 +96,7 @@ public class SecurityContextTenantAware implements TenantAware { @Override public int hashCode() { - return (delegate != null) ? delegate.hashCode() : null; + return (delegate != null) ? delegate.hashCode() : -1; } @Override @@ -126,7 +126,7 @@ public class SecurityContextTenantAware implements TenantAware { @Override public boolean isAuthenticated() { - return (delegate != null) ? delegate.isAuthenticated() : null; + return (delegate != null) ? delegate.isAuthenticated() : true; } @Override From fe0a719edee94cc02a291aad16eef809c55c38ab Mon Sep 17 00:00:00 2001 From: Michael Hirsch Date: Tue, 19 Jul 2016 18:01:06 +0200 Subject: [PATCH 2/2] remove cacheable on initial tenant creation Signed-off-by: Michael Hirsch --- .../org/eclipse/hawkbit/repository/jpa/JpaSystemManagement.java | 1 - 1 file changed, 1 deletion(-) diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSystemManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSystemManagement.java index c897947c4..84e069538 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSystemManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSystemManagement.java @@ -167,7 +167,6 @@ public class JpaSystemManagement implements CurrentTenantCacheKeyGenerator, Syst } @Override - @Cacheable(value = "tenantMetadata", key = "#tenant.toUpperCase()", cacheManager = "directCacheManager") @Transactional(isolation = Isolation.READ_UNCOMMITTED) @Modifying public TenantMetaData getTenantMetadata(final String tenant) {