From 8d6e4cfa01c9992aa0ee801b973ab4af45556866 Mon Sep 17 00:00:00 2001
From: sinthuja <sinthuja@wso2.com>
Date: Wed, 31 May 2017 18:01:07 +0530
Subject: [PATCH] Fixing issues in resolving the configuration resolving.

---
 .../mgt/core/util/ApplicationManagementUtil.java            | 6 +++---
 .../pom.xml                                                 | 6 ------
 features/application-mgt/pom.xml                            | 3 +--
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/ApplicationManagementUtil.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/ApplicationManagementUtil.java
index 070e57f1c81..6c3d6377df4 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/ApplicationManagementUtil.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/ApplicationManagementUtil.java
@@ -94,9 +94,9 @@ public class ApplicationManagementUtil {
     private static <T> T getInstance(Extension extension, Class<T> cls) throws InvalidConfigurationException {
         try {
             Class theClass = Class.forName(extension.getClassName());
-            Class[] types = new Class[extension.getParameters().size()];
-            Object[] paramValues = new String[extension.getParameters().size()];
             if (extension.getParameters() != null && extension.getParameters().size() > 0) {
+                Class[] types = new Class[extension.getParameters().size()];
+                Object[] paramValues = new String[extension.getParameters().size()];
                 for (int i = 0; i < extension.getParameters().size(); i++) {
                     types[i] = String.class;
                     paramValues[i] = extension.getParameters().get(i).getValue();
@@ -104,7 +104,7 @@ public class ApplicationManagementUtil {
                 Constructor<T> constructor = theClass.getConstructor(types);
                 return constructor.newInstance(paramValues);
             } else {
-                Constructor<T> constructor = theClass.getConstructor(types);
+                Constructor<T> constructor = theClass.getConstructor();
                 return constructor.newInstance();
             }
         } catch (Exception e) {
diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/pom.xml b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/pom.xml
index b39dededb9a..87e8f0c2031 100644
--- a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/pom.xml
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/pom.xml
@@ -49,11 +49,6 @@
             <artifactId>org.wso2.carbon.device.application.mgt.api.feature</artifactId>
             <type>zip</type>
         </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>org.wso2.carbon.device.application.mgt.extensions.feature</artifactId>
-            <type>zip</type>
-        </dependency>
     </dependencies>
 
     <build>
@@ -105,7 +100,6 @@
                             </adviceFile>
                             <includedFeatures>
                                 <includedFeatureDef>org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.api.feature:${carbon.device.mgt.version}</includedFeatureDef>
-                                <includedFeatureDef>org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.extensions.feature:${carbon.device.mgt.version}</includedFeatureDef>
                             </includedFeatures>
                             <bundles>
                                 <bundleDef>
diff --git a/features/application-mgt/pom.xml b/features/application-mgt/pom.xml
index d2dc6d58054..7a675aa176b 100644
--- a/features/application-mgt/pom.xml
+++ b/features/application-mgt/pom.xml
@@ -27,7 +27,6 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>application-mgt-feature</artifactId>
     <version>2.0.63-SNAPSHOT</version>
     <packaging>pom</packaging>
@@ -38,7 +37,7 @@
         <module>org.wso2.carbon.device.application.mgt.api.feature</module>
         <module>org.wso2.carbon.device.application.mgt.ui.feature</module>
         <module>org.wso2.carbon.device.application.mgt.feature</module>
-        <module>org.wso2.carbon.device.application.mgt.extensions.feature</module>
+        <!--<module>org.wso2.carbon.device.application.mgt.extensions.feature</module>-->
         <module>org.wso2.carbon.device.application.mgt.server.feature</module>
     </modules>
 </project>
\ No newline at end of file