Merge branch '4.0.0-grouping' of
https://git-wip-us.apache.org/repos/asf/stratos into 4.0.0-grouping
Conflicts:
components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/definition/ApplicationBean.java
components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/services/MetaDataAdmin.java
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/057217f2
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/057217f2
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/057217f2
Branch: refs/heads/4.0.0-grouping
Commit: 057217f28f1836b151eb899af2d5e791face5daf
Parents: ee4c201 4fc28db
Author: Udara Liyanage <[email protected]>
Authored: Mon Sep 22 17:34:21 2014 +0530
Committer: Udara Liyanage <[email protected]>
Committed: Mon Sep 22 17:34:21 2014 +0530
----------------------------------------------------------------------
.../org/apache/stratos/metadataservice/services/MetaDataAdmin.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/057217f2/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/services/MetaDataAdmin.java
----------------------------------------------------------------------
diff --cc
components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/services/MetaDataAdmin.java
index c41f56f,670c01b..051e46c
---
a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/services/MetaDataAdmin.java
+++
b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/services/MetaDataAdmin.java
@@@ -108,7 -108,7 +108,7 @@@ public class MetaDataAdmin
String registryType =
conf.getString("metadataservice.govenanceregistrytype",
defaultRegType);
-- List<NewProperty> properties = null;
++ List<NewProperty> properties;
NewProperty[] propertiesArr = null;
try {
properties =
DataRegistryFactory.getDataRegistryFactory(registryType)
