Update change log and spec for wrt-plugins-tizen_0.4.70

[framework/web/wrt-plugins-tizen.git] / src / Bluetooth / JSBluetoothSocket.cpp

diff --git a/src/Bluetooth/JSBluetoothSocket.cpp b/src/Bluetooth/JSBluetoothSocket.cpp
index 6bfb9ef..f8b3a0a 100644 (file)
--- a/src/Bluetooth/JSBluetoothSocket.cpp
+++ b/src/Bluetooth/JSBluetoothSocket.cpp
@@ -239,13 +239,7 @@ JSValueRef JSBluetoothSocket::writeData(JSContextRef context,
         const JSValueRef arguments[],
         JSValueRef* exception)
 {
-    TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 1);;
-
-    // Access Check
-    TIME_TRACER_ITEM_BEGIN("writeData::ACE", 1);;
-    AceSecurityStatus status = BLUETOOTH_CHECK_ACCESS(BLUETOOTH_SOCKET_API_WRITE_DATA);
-    TIME_TRACER_ITEM_END("writeData::ACE", 1);;
-    TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
+       TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 1);
 
     try {
         // Private Object
@@ -253,7 +247,12 @@ JSValueRef JSBluetoothSocket::writeData(JSContextRef context,
         if (!priv) {
             throw DeviceAPI::Common::UnknownException("Private object is NULL.");
         }
-    
+
+               // Access Check    
+           TIME_TRACER_ITEM_BEGIN("writeData::ACE", 1);        
+               TIZEN_CHECK_ACCESS(context, exception, priv, BLUETOOTH_SOCKET_API_WRITE_DATA);          
+           TIME_TRACER_ITEM_END("writeData::ACE", 1);
+
         ArgumentValidator validator(context, argumentCount, arguments);
 
         JSObjectRef dataArrayObj  = validator.toArrayObject(0);  // data
@@ -284,13 +283,8 @@ JSValueRef JSBluetoothSocket::readData(JSContextRef context,
         const JSValueRef arguments[],
         JSValueRef* exception)
 {
-    TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 1);;
-    
-    // Access Check
-    TIME_TRACER_ITEM_BEGIN("readData::ACE", 1);;
-    AceSecurityStatus status = BLUETOOTH_CHECK_ACCESS(BLUETOOTH_SOCKET_API_READ_DATA);
-    TIME_TRACER_ITEM_END("readData::ACE", 1);;
-    TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
+       TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 1);
+
 
     try {
         // Private Object
@@ -298,9 +292,15 @@ JSValueRef JSBluetoothSocket::readData(JSContextRef context,
         if (!priv) {
             throw DeviceAPI::Common::UnknownException("Private object is NULL.");
         }
+               
+               // Access Check
+               TIME_TRACER_ITEM_BEGIN("readData::ACE", 1);
+               TIZEN_CHECK_ACCESS(context, exception, priv, BLUETOOTH_SOCKET_API_READ_DATA);           
+               TIME_TRACER_ITEM_END("readData::ACE", 1);
+               
 
         std::vector<signed char> data = priv->readData();
-        TIME_TRACER_ITEM_END(__FUNCTION__, 1);;
+        TIME_TRACER_ITEM_END(__FUNCTION__, 1);
         
         return JSUtil::toJSValueRef_(context, data);
     } catch (const BasePlatformException &err) {
@@ -319,12 +319,6 @@ JSValueRef JSBluetoothSocket::close(JSContextRef context,
         JSValueRef* exception)
 {
     TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 1);;
-    
-    // Access Check
-    TIME_TRACER_ITEM_BEGIN("close::ACE", 1);;
-    AceSecurityStatus status = BLUETOOTH_CHECK_ACCESS(BLUETOOTH_SOCKET_API_CLOSE);
-    TIME_TRACER_ITEM_END("close::ACE", 1);;
-    TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
 
     try {
         // Private Object
@@ -333,6 +327,12 @@ JSValueRef JSBluetoothSocket::close(JSContextRef context,
             throw DeviceAPI::Common::UnknownException("Private object is NULL.");
         }
 
+               // Access Check
+               TIME_TRACER_ITEM_BEGIN("close::ACE", 1);
+               TIZEN_CHECK_ACCESS(context, exception, priv, BLUETOOTH_SOCKET_API_CLOSE);               
+               TIME_TRACER_ITEM_END("close::ACE", 1);
+               
+
         priv->close();
         TIME_TRACER_ITEM_END(__FUNCTION__, 1);;