From 7077f0ffb8f7ac3e0ff0f5fd74782c19654236b6 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Tue, 7 Jun 2022 18:11:13 +0200 Subject: [PATCH] Trying to fix handlers --- .../handler/resourceregistry/EServiceHandler.java | 6 +++--- .../handler/resourceregistry/HostingNodeHandler.java | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceHandler.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceHandler.java index 62396ae..5e31f34 100644 --- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceHandler.java +++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceHandler.java @@ -105,9 +105,6 @@ public class EServiceHandler extends ApplicationLifecycleHandler { Set startContextsUUID = new HashSet<>(); ContextCache contextCache = ContextCache.getInstance(); for (String token : startTokens) { - String contextFullName = ContextUtility.getContextName(token); - UUID contextUUID = contextCache.getUUIDByFullName(contextFullName); - startContextsUUID.add(contextUUID); try { if (create) { ContextUtility.setContextFromToken(token); @@ -124,6 +121,9 @@ public class EServiceHandler extends ApplicationLifecycleHandler { logger.error("Unable to add {} with UUID {} to current context ({})", EService.NAME, uuid, ContextUtility.getContextName(token), e); } + String contextFullName = ContextUtility.getContextName(token); + UUID contextUUID = contextCache.getUUIDByFullName(contextFullName); + startContextsUUID.add(contextUUID); } Set resourceContextsUUID = eServiceManager.getContextsUUID().keySet(); diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeHandler.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeHandler.java index 2d5e868..9300040 100644 --- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeHandler.java +++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeHandler.java @@ -69,6 +69,7 @@ public class HostingNodeHandler extends ContainerHandler { public HostingNodeHandler() { super(); + } @Override @@ -105,9 +106,6 @@ public class HostingNodeHandler extends ContainerHandler { Set startContextsUUID = new HashSet<>(); ContextCache contextCache = ContextCache.getInstance(); for (String token : startTokens) { - String contextFullName = ContextUtility.getContextName(token); - UUID contextUUID = contextCache.getUUIDByFullName(contextFullName); - startContextsUUID.add(contextUUID); try { if (create) { ContextUtility.setContextFromToken(token); @@ -126,6 +124,9 @@ public class HostingNodeHandler extends ContainerHandler { logger.error("Unable to add {} with UUID {} to current context ({})", HostingNode.NAME, uuid, ContextUtility.getContextName(token), e); } + String contextFullName = ContextUtility.getContextName(token); + UUID contextUUID = contextCache.getUUIDByFullName(contextFullName); + startContextsUUID.add(contextUUID); } Set resourceContextsUUID = hostingNodeManager.getContextsUUID().keySet();