You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/02/07 17:05:33 UTC
stratos git commit: Fixing the issues related to the governance
registry meta data update
Repository: stratos
Updated Branches:
refs/heads/master 4f89ff8e0 -> d2335fb5a
Fixing the issues related to the governance registry meta data update
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d2335fb5
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d2335fb5
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d2335fb5
Branch: refs/heads/master
Commit: d2335fb5af0931035daffefd3b1c944b96351548
Parents: 4f89ff8
Author: Gayan Gunarathne <ga...@wso2.com>
Authored: Fri Feb 6 22:33:33 2015 +0530
Committer: Gayan Gunarathne <ga...@wso2.com>
Committed: Sat Feb 7 21:03:40 2015 +0530
----------------------------------------------------------------------
.../stratos/metadata/service/registry/CarbonRegistry.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d2335fb5/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/CarbonRegistry.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/CarbonRegistry.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/CarbonRegistry.java
index 32fdc56..836520a 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/CarbonRegistry.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/CarbonRegistry.java
@@ -57,7 +57,7 @@ public class CarbonRegistry implements DataStore {
* @throws RegistryException
*/
public List<NewProperty> getPropertiesOfCluster(String applicationName, String clusterId) throws RegistryException {
- Registry tempRegistry = ServiceReferenceHolder.getRegistryService().getRegistry();
+ Registry tempRegistry = ServiceReferenceHolder.getInstance().getRegistryService().getRegistry();
String resourcePath = mainResource + applicationName + "/" + clusterId;
if (!tempRegistry.resourceExists(resourcePath)) {
return null;
@@ -91,7 +91,7 @@ public class CarbonRegistry implements DataStore {
* @throws RegistryException
*/
public void addPropertyToCluster(String applicationId, String clusterId, NewProperty property) throws RegistryException {
- Registry tempRegistry = ServiceReferenceHolder.getRegistryService().getRegistry();
+ Registry tempRegistry = ServiceReferenceHolder.getInstance().getRegistryService().getRegistry();
String resourcePath = mainResource + applicationId + "/" + clusterId;
Resource regResource = createOrGetResourceforCluster(tempRegistry, resourcePath);
@@ -111,7 +111,7 @@ public class CarbonRegistry implements DataStore {
if(StringUtils.isBlank(applicationId)){
throw new IllegalArgumentException("Application ID can not be null");
}
- Registry tempRegistry = ServiceReferenceHolder.getRegistryService().getRegistry();
+ Registry tempRegistry = ServiceReferenceHolder.getInstance().getRegistryService().getRegistry();
String resourcePath = mainResource + applicationId;
if(tempRegistry.resourceExists(resourcePath)){
@@ -131,7 +131,7 @@ public class CarbonRegistry implements DataStore {
* @throws RegistryException
*/
public void addPropertiesToCluster(String applicationName, String clusterId, NewProperty[] properties) throws RegistryException {
- Registry tempRegistry = ServiceReferenceHolder.getRegistryService().getRegistry();
+ Registry tempRegistry = ServiceReferenceHolder.getInstance().getRegistryService().getGovernanceSystemRegistry();
String resourcePath = mainResource + applicationName + "/" + clusterId;
Resource regResource;
regResource = createOrGetResourceforCluster(tempRegistry, resourcePath);