Synchronized, Between tizen_2.1 and tizen_2.2

Change-Id: Idd386d83013f46b4c5673c0d25e6d18b84a2a725
Signed-off-by: Sinyoung Hwang <shiny.hwang@samsung.com>

diff --git a/inc/FNetIp4Address.h b/inc/FNetIp4Address.h
index 617b85d..c369fcb 100644 (file)
--- a/inc/FNetIp4Address.h
+++ b/inc/FNetIp4Address.h
@@ -47,15 +47,19 @@ class _Ip4AddressImpl;
  * The following example demonstrates how to use the %Ip4Address class.
  *
  * @code
+ *
+ *     #include <FBase.h>
+ *     #include <FNet.h>
+ *
  *     using namespace Tizen::Base;
  *     using namespace Tizen::Net;
  *
  *     result
- *     MyClass::SomeMethod(void)
+ *     SomeMethod(void)
  *     {
  *             result r = E_SUCCESS;
  *
- *             Tizen::Base::String ip4String(L"192.168.0.1");
+ *             String ip4String(L"192.168.0.1");
  *             Ip4Address* pIp4Address = new Ip4Address(ip4String);
  *
  *             // Gets the raw IP address.
@@ -64,8 +68,7 @@ class _Ip4AddressImpl;
  *             r = bb.Construct(sizeOfIp4Address);
  *             r = pIp4Address->GetAddress(bb);
  *
- *             // Success
- *             return (r);
+ *             return r;
  *     }
  * @endcode
  */

diff --git a/inc/FNetWifiWifiDirectGroupInfo.h b/inc/FNetWifiWifiDirectGroupInfo.h
index 58a4dad..0b87974 100644 (file)
--- a/inc/FNetWifiWifiDirectGroupInfo.h
+++ b/inc/FNetWifiWifiDirectGroupInfo.h
@@ -103,7 +103,7 @@ public:
        int GetMaxNumberOfClients(void) const;
 
        /**
-        * @if OSPDEPREC
+        * @cond OSPDEPREC
         * Gets the SSID.
         *
         * @if OSPCOMPAT
@@ -120,7 +120,7 @@ public:
         *                  For more information, see the issue description for @ref CompWifiDirectGroupInfoGetSsidPage "here".
         * @endif
         * @return      The SSID
-        * @endif
+        * @endcond
         */
        Tizen::Base::String GetSsid(void) const;
 

diff --git a/src/sockets/FNetSock_SecureSocketImpl.cpp b/src/sockets/FNetSock_SecureSocketImpl.cpp
index 374f306..4476008 100644 (file)
--- a/src/sockets/FNetSock_SecureSocketImpl.cpp
+++ b/src/sockets/FNetSock_SecureSocketImpl.cpp
@@ -2334,9 +2334,12 @@ ssl_connect:
        if (__isAsync == true)
        {
                __isRunFinished = true;
-               r = __pGlibSocketInfo->SetSocketEvent(this, __socketFd);
-               SysTryReturn(NID_NET_SOCK, r == E_SUCCESS, null, E_OUT_OF_MEMORY, "Memory allocation failed.");
-               SysLog(NID_NET_SOCK, "SocketFd : [%d], Set the socketEvent to attach All condition.", __socketFd);
+               if(__pGlibSocketInfo != null)
+               {
+                       r = __pGlibSocketInfo->SetSocketEvent(this, __socketFd);
+                       SysTryReturn(NID_NET_SOCK, r == E_SUCCESS, null, E_OUT_OF_MEMORY, "Memory allocation failed.");
+                       SysLog(NID_NET_SOCK, "SocketFd : [%d], Set the socketEvent to attach All condition.", __socketFd);
+               }
        }
 
        return null;