From: Jay Sharma <jay.sharma@samsung.com>
Date: Mon, 21 Sep 2015 06:24:35 +0000 (+0530)
Subject: [Resource-Encapsulation] Prevent fixes for Linux Sample applications.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fa8cc302b0cebbe43cf01b43db248cd95e4e51c5;p=contrib%2Fiotivity.git

[Resource-Encapsulation] Prevent fixes for Linux Sample applications.

Change-Id: Ibd2ec1c4af6994a7022526f5afb8c2c274f20ec8
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2815
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
---

diff --git a/service/resource-encapsulation/examples/linux/NestedAttributeClient.cpp b/service/resource-encapsulation/examples/linux/NestedAttributeClient.cpp
index 6fe5222..2e888f8 100644
--- a/service/resource-encapsulation/examples/linux/NestedAttributeClient.cpp
+++ b/service/resource-encapsulation/examples/linux/NestedAttributeClient.cpp
@@ -294,9 +294,15 @@ bool discoverResource()
 {
     std::cout << "Wait 2 seconds until discovered." << std::endl;
 
-    RCSDiscoveryManager::getInstance()->discoverResourceByType(RCSAddress::multicast(),
-            relativetUri, resourceType, &onResourceDiscovered);
-
+    try
+    {
+        RCSDiscoveryManager::getInstance()->discoverResourceByType(RCSAddress::multicast(),
+                relativetUri, resourceType, &onResourceDiscovered);
+    }
+    catch(PlatformException e)
+    {
+         std::cout << "Platform Exception while calling discoverResourceByType" << std::endl;
+    }
     std::unique_lock<std::mutex> lck(mtx);
     cond.wait_for(lck, std::chrono::seconds(2));
 
diff --git a/service/resource-encapsulation/examples/linux/SampleResourceClient.cpp b/service/resource-encapsulation/examples/linux/SampleResourceClient.cpp
index 82c8781..0020c79 100644
--- a/service/resource-encapsulation/examples/linux/SampleResourceClient.cpp
+++ b/service/resource-encapsulation/examples/linux/SampleResourceClient.cpp
@@ -435,15 +435,29 @@ void discoverResource()
 
     std::cin >> addressInput;
 
-    if(addressInput == multicastAdd)
+    if (addressInput == multicastAdd)
     {
-        discoveryTask = RCSDiscoveryManager::getInstance()->discoverResourceByType(RCSAddress::multicast(),
-                relativeUri, resourceType, &onResourceDiscovered);
+        try
+        {
+            discoveryTask = RCSDiscoveryManager::getInstance()->discoverResourceByType(RCSAddress::multicast(),
+                            relativeUri, resourceType, &onResourceDiscovered);
+        }
+        catch (PlatformException e)
+        {
+            std::cout << "Platform Exception while calling discoverResourceByType" << std::endl;
+        }
     }
     else
     {
-        discoveryTask = RCSDiscoveryManager::getInstance()->discoverResourceByType(RCSAddress::unicast
-                (addressInput), relativeUri, resourceType, &onResourceDiscovered);
+        try
+        {
+            discoveryTask = RCSDiscoveryManager::getInstance()->discoverResourceByType(RCSAddress::unicast
+                            (addressInput), relativeUri, resourceType, &onResourceDiscovered);
+        }
+        catch (PlatformException e)
+        {
+            std::cout << "Platform Exception while calling discoverResourceByType" << std::endl;
+        }
     }
 }