You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/09/26 15:19:33 UTC

[1/2] git commit: fixing a compilation failure and a NPE

Repository: stratos
Updated Branches:
  refs/heads/4.0.0-grouping 5649e6ed4 -> 6a29d398e


fixing a compilation failure and a NPE


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5fa84a08
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5fa84a08
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5fa84a08

Branch: refs/heads/4.0.0-grouping
Commit: 5fa84a08fd7051be17652b8377b155aed53e9cc5
Parents: 13ef15c
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Fri Sep 26 18:48:46 2014 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Fri Sep 26 18:48:46 2014 +0530

----------------------------------------------------------------------
 .../load/balancer/conf/LoadBalancerConfiguration.java    |  2 +-
 .../stratos/metadataservice/registry/CarbonRegistry.java | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/5fa84a08/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
index 3c6c5d1..c269419 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
@@ -441,7 +441,7 @@ public class LoadBalancerConfiguration {
 
                     for (Node clusterNode : clustersNode.getChildNodes()) {
                         String clusterId = clusterNode.getName();
-                        Cluster cluster = new Cluster(service.getServiceName(), clusterId, null, null);
+                        Cluster cluster = new Cluster(service.getServiceName(), clusterId, null, null, null);
 
                         String tenantRange = clusterNode.getProperty(Constants.CONF_PROPERTY_TENANT_RANGE);
                         if (StringUtils.isNotBlank(tenantRange)) {

http://git-wip-us.apache.org/repos/asf/stratos/blob/5fa84a08/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/CarbonRegistry.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/CarbonRegistry.java b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/CarbonRegistry.java
index d721c8b..98377c4 100644
--- a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/CarbonRegistry.java
+++ b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/CarbonRegistry.java
@@ -176,8 +176,15 @@ public class CarbonRegistry extends AbstractAdmin implements DataStore {
 	                                                                                           throws Exception {
 		Registry registry = getGovernanceUserRegistry();
 		String resourcePath = mainResource + applicationName + "/" + cartridgeType;
-		registry.delete(resourcePath);
-		return false;
+        if (registry != null) {
+		    registry.delete(resourcePath);
+            return true;
+        } else {
+            if (log.isDebugEnabled()) {
+                log.debug("Unable to delete the meta data since the Registry is NULL");
+            }
+            return false;
+        }
 	}
 
 


[2/2] git commit: Merge branch '4.0.0-grouping' of https://git-wip-us.apache.org/repos/asf/stratos into 4.0.0-grouping

Posted by is...@apache.org.
Merge branch '4.0.0-grouping' of https://git-wip-us.apache.org/repos/asf/stratos into 4.0.0-grouping


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6a29d398
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6a29d398
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6a29d398

Branch: refs/heads/4.0.0-grouping
Commit: 6a29d398e5545eac4864f25539cf40f2e6b2c77e
Parents: 5fa84a0 5649e6e
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Fri Sep 26 18:49:12 2014 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Fri Sep 26 18:49:12 2014 +0530

----------------------------------------------------------------------
 .../stratos/autoscaler/status/checker/StatusChecker.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------