Fix for JIRA Issue IOT-535 and IOT-536

Change-Id: I5d581e8e2d98fa55f2718fecfa8143d0d59d6d17
Signed-off-by: Krishna Kumar KB <krishna.kb@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1167
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: RadhaBhavani <radha.p@samsung.com>
Reviewed-by: Younghyun Joo <yh_.joo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/protocol-plugin/plugin-manager/src/Android/src/org/iotivity/service/ppm/FelixManager.java b/service/protocol-plugin/plugin-manager/src/Android/src/org/iotivity/service/ppm/FelixManager.java
index b7d7c87..0822c09 100644 (file)
--- a/service/protocol-plugin/plugin-manager/src/Android/src/org/iotivity/service/ppm/FelixManager.java
+++ b/service/protocol-plugin/plugin-manager/src/Android/src/org/iotivity/service/ppm/FelixManager.java
@@ -262,7 +262,6 @@ public class FelixManager {
                     Log.d("Felix", "bundle: " + b.getBundleId()
                             + "   symbolicName : " + b.getSymbolicName());
                     b.stop();
-                    b.uninstall();
                     Log.d("Felix", "stop end");
                 }
             }

diff --git a/service/protocol-plugin/plugin-manager/src/FelixAdapter.cpp b/service/protocol-plugin/plugin-manager/src/FelixAdapter.cpp
index 44df0bf..b18efd9 100644 (file)
--- a/service/protocol-plugin/plugin-manager/src/FelixAdapter.cpp
+++ b/service/protocol-plugin/plugin-manager/src/FelixAdapter.cpp
@@ -183,6 +183,14 @@ std::vector<Plugin> &FelixAdapter::getAllPlugins(void)
                                 env->NewStringUTF(key.c_str()));
         std::string resourcetype = env->GetStringUTFChars(jresourcetype, 0);
         plugin->setValue("ResourceType", resourcetype);
+
+        // set ResourceURL value
+        key = "Url";
+        jstring juritype = (jstring)env->CallStaticObjectMethod(cls, mid, jid,
+                                env->NewStringUTF(key.c_str()));
+        std::string url = env->GetStringUTFChars(juritype, 0);
+        plugin->setValue("Url", url);
+
         // push the plugin into the vector
         m_plugins.push_back(*plugin);
     }