From 06fab8b5f1dbf9f7de0c052d2a2eeeb7f5a16f4f Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Thu, 15 Sep 2016 13:54:48 +0000 Subject: [PATCH] updated astyanax dependencies git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portal/social-networking-library@131390 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 2 +- .../org/gcube/portal/databook/server/RunningCluster.java | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index db4e3bf..c0d5c93 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.gcube.portal social-networking-library - 1.13.0-SNAPSHOT + 1.14.0-SNAPSHOT gCube Social Networking Library The gCube Social Networking Library is the 'bridge' between your gCube Applications and the social networking facilities. diff --git a/src/main/java/org/gcube/portal/databook/server/RunningCluster.java b/src/main/java/org/gcube/portal/databook/server/RunningCluster.java index 1bc34ce..232db77 100644 --- a/src/main/java/org/gcube/portal/databook/server/RunningCluster.java +++ b/src/main/java/org/gcube/portal/databook/server/RunningCluster.java @@ -60,7 +60,7 @@ public class RunningCluster implements Serializable { private String keyspaceName; /** - * @ param infrastructureName could be null + * @param infrastructureName could be null * @return an instance of the RunningCluster */ public static synchronized RunningCluster getInstance(String infrastructureName) { @@ -103,11 +103,14 @@ public class RunningCluster implements Serializable { */ private List getConfigurationFromIS(String infrastructureName) throws Exception { PortalContext context = PortalContext.getConfiguration(); + _log.debug("getConfigurationFromIS infrastructureName="+infrastructureName ); String scope = "/"; if(infrastructureName != null && !infrastructureName.isEmpty()) scope += infrastructureName; - else - scope += context.getInfrastructureName(); + else { + scope = context.getInfrastructureName(); + _log.debug("infrastrucute name is null, setting root scope=" + scope); + } String currScope = ScopeProvider.instance.get(); ScopeProvider.instance.set(scope); SimpleQuery query = queryFor(ServiceEndpoint.class);