From d79b91361edafb3bc19834f027d6c34ef2641f94 Mon Sep 17 00:00:00 2001
From: "luca.frosini" <luca.frosini@isti.cnr.it>
Date: Thu, 23 Nov 2017 16:28:30 +0000
Subject: [PATCH] Refs #10238: Refactor Context Port Type

Task-Url: https://support.d4science.org/issues/10238

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/resource-registry@158791 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../resourceregistry/context/ContextManagement.java          | 1 +
 .../resourceregistry/context/SecurityContextMapper.java      | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextManagement.java
index 36d1e45..0fd9cb3 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextManagement.java
@@ -216,6 +216,7 @@ public class ContextManagement extends EntityManagement<Context> {
 				
 			}else {
 				checkContext(null);
+				SecurityContext.createSecurityContext(orientGraph, uuid, true);
 				createVertex();
 			}
 			
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/context/SecurityContextMapper.java b/src/main/java/org/gcube/informationsystem/resourceregistry/context/SecurityContextMapper.java
index 11840b1..285a9d6 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/context/SecurityContextMapper.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/context/SecurityContextMapper.java
@@ -58,7 +58,6 @@ public abstract class SecurityContextMapper {
 			if (created) {
 				SecurityContext.createSecurityContext(orientGraph, ADMIN_SECURITY_CONTEXT_UUID, true);
 				SecurityContext.createSecurityContext(orientGraph, MANAGEMENT_SECURITY_CONTEXT_UUID, true);
-				DatabaseIntializator.createEntitiesAndRelations();
 			}
 			
 			for (PermissionMode p : PermissionMode.values()) {
@@ -69,6 +68,10 @@ public abstract class SecurityContextMapper {
 				getSecurityContextFactory(MANAGEMENT_SECURITY_CONTEXT_UUID, p, false);
 			}
 			
+			if(created) {
+				DatabaseIntializator.createEntitiesAndRelations();
+			}
+			
 		} catch (Exception e) {
 			logger.error("Error initializing database connection", e);
 			throw new RuntimeException(