You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2014/03/05 07:40:37 UTC
git commit: fixing listing cartridges issue after backend exception
Repository: incubator-stratos
Updated Branches:
refs/heads/master f583e13ba -> 13e5733f4
fixing listing cartridges issue after backend exception
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/13e5733f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/13e5733f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/13e5733f
Branch: refs/heads/master
Commit: 13e5733f4bf20aae1fe039c613303bd6d3c39919
Parents: f583e13
Author: rekathiru <rt...@gmail.com>
Authored: Wed Mar 5 12:10:22 2014 +0530
Committer: rekathiru <rt...@gmail.com>
Committed: Wed Mar 5 12:10:22 2014 +0530
----------------------------------------------------------------------
.../console/themes/theme1/renderers/index.js | 3 +++
.../org.apache.stratos.manager.console/console/util/utility.jag | 4 ----
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/13e5733f/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
index ae680af..443e2b0 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
@@ -2,6 +2,9 @@ var render = function (theme, data, meta, require) {
// Re-create the data structure of the cartridges.
var cartridges_old = data.mycartridges.cartridge;
+ if(cartridges_old == null) {
+ cartridges_old = {};
+ }
session.remove("get-status");
session.remove("deploy-status");
var cartridges_new = [
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/13e5733f/components/org.apache.stratos.manager.console/console/util/utility.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/util/utility.jag b/components/org.apache.stratos.manager.console/console/util/utility.jag
index d3891b9..d0716ba 100644
--- a/components/org.apache.stratos.manager.console/console/util/utility.jag
+++ b/components/org.apache.stratos.manager.console/console/util/utility.jag
@@ -320,15 +320,12 @@ consoleAppUtil = new function(){
var headers = this.getRequestHeaders(config.ssoConfiguration.enabled);
var type = "json"; // response format
var response;
- log.info("8888888888888888888888");
- log.info(data);
switch (httpMethod){
case "GET":
response = get(endpoint,{},headers, 'json');
break;
case "POST":
response = post(endpoint,data,headers, 'json');
- log.info(response);
break;
case "PUT":
response = put(endpoint,data,headers, 'json');
@@ -339,7 +336,6 @@ consoleAppUtil = new function(){
default :
log.error("Error in the programme flow.");
}
- log.info("999999999999999");
if(response.data.stratosAdminResponse) {
session.put("deploy-status", "succeeded");
} else if (response.data.Error) {