From 1c97bef57a0d36c8171536f2632eebe9bb1e6991 Mon Sep 17 00:00:00 2001
From: coderhyme <jhyo.kim@samsung.com>
Date: Sat, 13 Jun 2015 13:30:51 +0900
Subject: [PATCH] Add exception handling in server builder to convert
 OCException into PrimitiveException

Change-Id: I372ef6bbbb1d7521bdae46572165df51bc080ec4
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1305
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
---
 service/basis/serverBuilder/src/PrimitiveServerResource.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/service/basis/serverBuilder/src/PrimitiveServerResource.cpp b/service/basis/serverBuilder/src/PrimitiveServerResource.cpp
index 4d190df..ad2a01a 100644
--- a/service/basis/serverBuilder/src/PrimitiveServerResource.cpp
+++ b/service/basis/serverBuilder/src/PrimitiveServerResource.cpp
@@ -140,9 +140,16 @@ namespace OIC
             OC::EntityHandler entityHandler{ std::bind(&PrimitiveServerResource::entityHandler,
                     server.get(), std::placeholders::_1) };
 
-            expectOCStackResultOK(
-                    OC::OCPlatform::registerResource(handle, m_uri, m_type, m_interface,
-                            entityHandler, m_properties));
+            try
+            {
+                expectOCStackResultOK(
+                        OC::OCPlatform::registerResource(handle, m_uri, m_type, m_interface,
+                                entityHandler, m_properties));
+            }
+            catch (OC::OCException& e)
+            {
+                throw PlatformException(e.code());
+            }
 
             server->m_resourceHandle = handle;
 
-- 
2.7.4