You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/04/16 23:26:36 UTC
[1/2] git commit: fixing a possible NPE, when the class name is null
Repository: incubator-stratos
Updated Branches:
refs/heads/master 8990923bd -> 7d92e736c
fixing a possible NPE, when the class name is null
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/3d32585c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3d32585c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3d32585c
Branch: refs/heads/master
Commit: 3d32585c302c3c931815c013fb223a788b86963a
Parents: 78c7dd2
Author: Nirmal Fernando <ni...@apache.org>
Authored: Thu Apr 17 02:55:47 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Thu Apr 17 02:55:47 2014 +0530
----------------------------------------------------------------------
.../stratos/cloud/controller/util/CloudControllerUtil.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3d32585c/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
index 2c9738e..a213adf 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
@@ -246,6 +246,14 @@ public class CloudControllerUtil {
private static Iaas loadIaas(IaasProvider iaasProvider)
throws InvalidIaasProviderException {
try {
+
+ if(iaasProvider.getClassName() == null) {
+ String msg = "You have not specified a class which represents the iaas of type: ["
+ + iaasProvider.getType() + "].";
+ log.error(msg);
+ throw new InvalidIaasProviderException(msg);
+ }
+
Constructor<?> c = Class.forName(iaasProvider.getClassName())
.getConstructor(IaasProvider.class);
Iaas iaas = (Iaas) c.newInstance(iaasProvider);
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ni...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/7d92e736
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7d92e736
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7d92e736
Branch: refs/heads/master
Commit: 7d92e736cbb05d6d7ed1e479303f2d9d386675e8
Parents: 3d32585 8990923
Author: Nirmal Fernando <ni...@apache.org>
Authored: Thu Apr 17 02:56:12 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Thu Apr 17 02:56:12 2014 +0530
----------------------------------------------------------------------
.../cli/beans/cartridge/CartridgeInfoBean.java | 35 +++---
.../console/app.js~ | 14 ---
.../console/controllers/router.jag | 4 +-
.../console/default_page.jag | 25 ----
.../console/error-404.html | 110 +++++++++++++++++
.../console/error.html | 118 +++++++++++++++++++
.../console/jaggery.conf | 7 +-
.../console/themes/theme1/partials/404.hbs | 52 --------
.../themes/theme1/renderers/default_page.js | 59 ----------
.../repository/RepositoryNotification.java | 34 +++---
.../manager/subscription/SubscriptionData.java | 36 +++---
.../org/apache/stratos/rest/endpoint/Utils.java | 36 +++---
.../rest/endpoint/bean/CartridgeInfoBean.java | 35 +++---
.../repositoryNotificationInfoBean/Payload.java | 34 +++---
.../Repository.java | 34 +++---
.../rest/endpoint/bean/topology/Cluster.java | 35 +++---
.../rest/endpoint/bean/topology/Member.java | 35 +++---
...tractAuthenticationAuthorizationHandler.java | 36 +++---
.../handlers/CustomExceptionMapper.java | 36 +++---
.../stratos/rest/endpoint/mock/MockContext.java | 36 +++---
.../rest/endpoint/services/ServiceUtils.java | 36 +++---
.../pom.xml | 29 +++--
.../distribution/src/main/conf/log4j.properties | 5 +
products/stratos/modules/distribution/pom.xml | 5 +
.../modules/distribution/src/assembly/bin.xml | 24 +++-
.../distribution/src/main/conf/log4j.properties | 2 +
tools/puppet3/manifests/nodes.pp | 12 +-
.../templates/extensions/addons/_nodejs.erb | 21 ++++
.../agent/templates/extensions/addons/_php.erb | 18 +++
.../extensions/artifacts-updated.sh.erb | 4 +
.../templates/extensions/start-servers.sh.erb | 3 +
.../repository/conf/activemq/jndi.properties | 31 ++---
.../config/all/repository/conf/jndi.properties | 31 ++---
.../all/repository/conf/wso2mb/jndi.properties | 17 +++
.../repository/conf/activemq/jndi.properties | 31 ++---
.../config/cep/repository/conf/jndi.properties | 31 ++---
36 files changed, 657 insertions(+), 454 deletions(-)
----------------------------------------------------------------------