Repository: stratos
Updated Branches:
  refs/heads/4.0.0-grouping 37bbe696c -> 8b6bc5142


temp fix for METADATA_CLIENT_CONFIG_FILE system property not found issue


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

Branch: refs/heads/4.0.0-grouping
Commit: 8b6bc51425a8369ce08ee467cc0a09b2be1bc11f
Parents: 37bbe69
Author: Isuru Haththotuwa <[email protected]>
Authored: Wed Sep 24 21:57:44 2014 +0530
Committer: Isuru Haththotuwa <[email protected]>
Committed: Wed Sep 24 21:57:44 2014 +0530

----------------------------------------------------------------------
 .../stratos/cloud/controller/application/ApplicationUtils.java   | 4 ++--
 .../metadata/client/sample/MetaDataServiceClientSample.java      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/8b6bc514/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/ApplicationUtils.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/ApplicationUtils.java
 
b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/ApplicationUtils.java
index 8783839..7117170 100644
--- 
a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/ApplicationUtils.java
+++ 
b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/ApplicationUtils.java
@@ -159,11 +159,11 @@ public class ApplicationUtils {
         payloadBuilder.append(",");
         payloadBuilder.append("CLUSTER_ID=" + clusterId);
         // meta data endpoint
-        if (MetaDataClientConfig.getInstance().getMetaDataServiceBaseUrl() != 
null) {
+       // if (MetaDataClientConfig.getInstance().getMetaDataServiceBaseUrl() 
!= null) {
             // TODO
             //payloadBuilder.append(",");
             //payloadBuilder.append("METADATA_ENDPOINT=" + 
MetaDataClientConfig.getInstance().getMetaDataServiceBaseUrl());
-        }
+       // }
         payloadBuilder.append(",");
 
         return payloadBuilder;

http://git-wip-us.apache.org/repos/asf/stratos/blob/8b6bc514/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/sample/MetaDataServiceClientSample.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/sample/MetaDataServiceClientSample.java
 
b/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/sample/MetaDataServiceClientSample.java
index fd50cb7..6c0215d 100644
--- 
a/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/sample/MetaDataServiceClientSample.java
+++ 
b/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/sample/MetaDataServiceClientSample.java
@@ -44,7 +44,7 @@ public class MetaDataServiceClientSample {
 
 
     public MetaDataServiceClientSample() throws RestClientException {
-        initialize();
+        //initialize();
     }
 
     private void initialize() throws RestClientException {

Reply via email to